diff --git a/programs/system/kobra/trunk/Makefile b/programs/system/kobra/Makefile
similarity index 90%
rename from programs/system/kobra/trunk/Makefile
rename to programs/system/kobra/Makefile
index 755f60901..f6a9e4e83 100644
--- a/programs/system/kobra/trunk/Makefile
+++ b/programs/system/kobra/Makefile
@@ -1,12 +1,12 @@
-ROOT=../../../develop/libraries/framework/trunk
+ROOT=../../develop/libraries/framework/trunk
 
-include ../../../develop/libraries/framework/trunk/config.mk
+include ../../develop/libraries/framework/trunk/config.mk
 
 # Note that kobra_st.o MUST be first and kobra.o last.
 OBJECTS=kobra_st.o $(ROOT)/stdlib/heap.o $(ROOT)/stdlib/malloc.o $(ROOT)/stdlib/stdlib.o $(ROOT)/kolibri/kolibri.o $(ROOT)/libIPC/ipc.o kobra.o
 
 # Set real path to kolibri.img if you want to use install option
-KOLIBRI_IMG=../../../../../../0.7.x-night/kolibri.img
+KOLIBRI_IMG=../../../../../0.7.x-night/kolibri.img
 
 # Path to kobra.kex on floppy (directory should be created before installing)
 DESTDIR=kobra/
diff --git a/programs/system/kobra/trunk/gpl3.txt b/programs/system/kobra/gpl3.txt
similarity index 100%
rename from programs/system/kobra/trunk/gpl3.txt
rename to programs/system/kobra/gpl3.txt
diff --git a/programs/system/kobra/trunk/history.txt b/programs/system/kobra/history.txt
similarity index 100%
rename from programs/system/kobra/trunk/history.txt
rename to programs/system/kobra/history.txt
diff --git a/programs/system/kobra/trunk/kobra.c b/programs/system/kobra/kobra.c
similarity index 100%
rename from programs/system/kobra/trunk/kobra.c
rename to programs/system/kobra/kobra.c
diff --git a/programs/system/kobra/trunk/kobra.h b/programs/system/kobra/kobra.h
similarity index 100%
rename from programs/system/kobra/trunk/kobra.h
rename to programs/system/kobra/kobra.h
diff --git a/programs/system/kobra/trunk/kobra_st.s b/programs/system/kobra/kobra_st.s
similarity index 100%
rename from programs/system/kobra/trunk/kobra_st.s
rename to programs/system/kobra/kobra_st.s
diff --git a/programs/system/kobra/trunk/kolibri.ld b/programs/system/kobra/kolibri.ld
similarity index 100%
rename from programs/system/kobra/trunk/kolibri.ld
rename to programs/system/kobra/kolibri.ld
diff --git a/programs/system/kobra/trunk/readme.txt b/programs/system/kobra/readme.txt
similarity index 100%
rename from programs/system/kobra/trunk/readme.txt
rename to programs/system/kobra/readme.txt
diff --git a/programs/system/kobra/trunk/symbols2dbg.py b/programs/system/kobra/symbols2dbg.py
similarity index 100%
rename from programs/system/kobra/trunk/symbols2dbg.py
rename to programs/system/kobra/symbols2dbg.py