diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 430641e2f8..2e3758b9c4 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -176,9 +176,9 @@ extra_files = {
  {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/src/*"},
  {"kolibrios/develop/fpc/examples/build.sh", "common/develop/fpc/build.sh"},
  {"kolibrios/develop/oberon07/", PROGS .. "/develop/oberon07/*"},
- {"kolibrios/develop/oberon07/Docs/", PROGS .. "/develop/oberon07/Docs/*"},
- {"kolibrios/develop/oberon07/Lib/KolibriOS/", PROGS .. "/develop/oberon07/Lib/KolibriOS/*"},
- {"kolibrios/develop/oberon07/Samples/", PROGS .. "/develop/oberon07/Samples/*"},
+ {"kolibrios/develop/oberon07/doc/", PROGS .. "/develop/oberon07/doc/*"},
+ {"kolibrios/develop/oberon07/lib/KolibriOS/", PROGS .. "/develop/oberon07/lib/KolibriOS/*"},
+ {"kolibrios/develop/oberon07/samples/", PROGS .. "/develop/oberon07/samples/*"},
  {"kolibrios/develop/oberon07/tools/", PROGS .. "/develop/oberon07/tools/*"},
  {"kolibrios/develop/tcc/", PROGS ..  "/develop/ktcc/trunk/*"},
 -- {"kolibrios/develop/tcc/", PROGS ..  "/develop/ktcc/trunk/bin/tcc"},
diff --git a/programs/cmm/clipview/clipview.c b/programs/cmm/clipview/clipview.c
index c22b3376b4..7f6654b096 100644
--- a/programs/cmm/clipview/clipview.c
+++ b/programs/cmm/clipview/clipview.c
@@ -203,7 +203,7 @@ void EventOpenAsText(int slot_id) {
 	slot_data = Clipboard__GetSlotData(slot_id);
 	cdata.size = ESDWORD[slot_data]-12;
 	cdata.content = slot_data+12;
-	if (SaveSlotContents(cdata.size, cdata.content)) RunProgram("/sys/tinypad", DEFAULT_SAVE_PATH);
+	if (SaveSlotContents(cdata.size, cdata.content)) RunProgram("/sys/develop/cedit", DEFAULT_SAVE_PATH);
 }
 
 void EventOpenAsHex(int slot_id) {
diff --git a/programs/develop/oberon07/samples/KolibriOS/Dialogs.ob07 b/programs/develop/oberon07/samples/Dialogs.ob07
similarity index 100%
rename from programs/develop/oberon07/samples/KolibriOS/Dialogs.ob07
rename to programs/develop/oberon07/samples/Dialogs.ob07
diff --git a/programs/develop/oberon07/samples/KolibriOS/HW.ob07 b/programs/develop/oberon07/samples/HW.ob07
similarity index 100%
rename from programs/develop/oberon07/samples/KolibriOS/HW.ob07
rename to programs/develop/oberon07/samples/HW.ob07
diff --git a/programs/develop/oberon07/samples/KolibriOS/HW_con.ob07 b/programs/develop/oberon07/samples/HW_con.ob07
similarity index 100%
rename from programs/develop/oberon07/samples/KolibriOS/HW_con.ob07
rename to programs/develop/oberon07/samples/HW_con.ob07