diff --git a/os/src/server/nitpicker/include/background.h b/os/src/server/nitpicker/background.h
similarity index 100%
rename from os/src/server/nitpicker/include/background.h
rename to os/src/server/nitpicker/background.h
diff --git a/os/src/server/nitpicker/data/big_mouse.h b/os/src/server/nitpicker/big_mouse.h
similarity index 100%
rename from os/src/server/nitpicker/data/big_mouse.h
rename to os/src/server/nitpicker/big_mouse.h
diff --git a/os/src/server/nitpicker/include/chunky_menubar.h b/os/src/server/nitpicker/chunky_menubar.h
similarity index 100%
rename from os/src/server/nitpicker/include/chunky_menubar.h
rename to os/src/server/nitpicker/chunky_menubar.h
diff --git a/os/src/server/nitpicker/include/clip_guard.h b/os/src/server/nitpicker/clip_guard.h
similarity index 100%
rename from os/src/server/nitpicker/include/clip_guard.h
rename to os/src/server/nitpicker/clip_guard.h
diff --git a/os/src/server/nitpicker/data/default.tff b/os/src/server/nitpicker/default.tff
similarity index 100%
rename from os/src/server/nitpicker/data/default.tff
rename to os/src/server/nitpicker/default.tff
diff --git a/os/src/server/nitpicker/include/draw_label.h b/os/src/server/nitpicker/draw_label.h
similarity index 100%
rename from os/src/server/nitpicker/include/draw_label.h
rename to os/src/server/nitpicker/draw_label.h
diff --git a/os/src/server/nitpicker/genode/global_keys.cc b/os/src/server/nitpicker/global_keys.cc
similarity index 100%
rename from os/src/server/nitpicker/genode/global_keys.cc
rename to os/src/server/nitpicker/global_keys.cc
diff --git a/os/src/server/nitpicker/include/global_keys.h b/os/src/server/nitpicker/global_keys.h
similarity index 100%
rename from os/src/server/nitpicker/include/global_keys.h
rename to os/src/server/nitpicker/global_keys.h
diff --git a/os/src/server/nitpicker/include/input.h b/os/src/server/nitpicker/input.h
similarity index 100%
rename from os/src/server/nitpicker/include/input.h
rename to os/src/server/nitpicker/input.h
diff --git a/os/src/server/nitpicker/genode/main.cc b/os/src/server/nitpicker/main.cc
similarity index 100%
rename from os/src/server/nitpicker/genode/main.cc
rename to os/src/server/nitpicker/main.cc
diff --git a/os/src/server/nitpicker/include/menubar.h b/os/src/server/nitpicker/menubar.h
similarity index 100%
rename from os/src/server/nitpicker/include/menubar.h
rename to os/src/server/nitpicker/menubar.h
diff --git a/os/src/server/nitpicker/include/mode.h b/os/src/server/nitpicker/mode.h
similarity index 100%
rename from os/src/server/nitpicker/include/mode.h
rename to os/src/server/nitpicker/mode.h
diff --git a/os/src/server/nitpicker/include/mouse_cursor.h b/os/src/server/nitpicker/mouse_cursor.h
similarity index 100%
rename from os/src/server/nitpicker/include/mouse_cursor.h
rename to os/src/server/nitpicker/mouse_cursor.h
diff --git a/os/src/server/nitpicker/include/session.h b/os/src/server/nitpicker/session.h
similarity index 100%
rename from os/src/server/nitpicker/include/session.h
rename to os/src/server/nitpicker/session.h
diff --git a/os/src/server/nitpicker/genode/target.mk b/os/src/server/nitpicker/target.mk
similarity index 65%
rename from os/src/server/nitpicker/genode/target.mk
rename to os/src/server/nitpicker/target.mk
index f87efef50..3c4644fc7 100644
--- a/os/src/server/nitpicker/genode/target.mk
+++ b/os/src/server/nitpicker/target.mk
@@ -5,14 +5,8 @@ SRC_CC   = main.cc \
            view.cc \
            user_state.cc \
            global_keys.cc
+
 SRC_BIN  = default.tff
 
 # enable C++11 support
 CC_CXX_OPT += -std=gnu++11
-
-INC_DIR  = $(PRG_DIR)/../include \
-           $(PRG_DIR)/../data
-
-vpath %.cc $(PRG_DIR)/../common
-vpath %    $(PRG_DIR)/../data
-
diff --git a/os/src/server/nitpicker/common/user_state.cc b/os/src/server/nitpicker/user_state.cc
similarity index 100%
rename from os/src/server/nitpicker/common/user_state.cc
rename to os/src/server/nitpicker/user_state.cc
diff --git a/os/src/server/nitpicker/include/user_state.h b/os/src/server/nitpicker/user_state.h
similarity index 100%
rename from os/src/server/nitpicker/include/user_state.h
rename to os/src/server/nitpicker/user_state.h
diff --git a/os/src/server/nitpicker/common/view.cc b/os/src/server/nitpicker/view.cc
similarity index 100%
rename from os/src/server/nitpicker/common/view.cc
rename to os/src/server/nitpicker/view.cc
diff --git a/os/src/server/nitpicker/include/view.h b/os/src/server/nitpicker/view.h
similarity index 100%
rename from os/src/server/nitpicker/include/view.h
rename to os/src/server/nitpicker/view.h
diff --git a/os/src/server/nitpicker/common/view_stack.cc b/os/src/server/nitpicker/view_stack.cc
similarity index 100%
rename from os/src/server/nitpicker/common/view_stack.cc
rename to os/src/server/nitpicker/view_stack.cc
diff --git a/os/src/server/nitpicker/include/view_stack.h b/os/src/server/nitpicker/view_stack.h
similarity index 100%
rename from os/src/server/nitpicker/include/view_stack.h
rename to os/src/server/nitpicker/view_stack.h