diff --git a/programs/develop/libraries/framework/trunk/config.mk b/programs/develop/libraries/framework/config.mk
similarity index 100%
rename from programs/develop/libraries/framework/trunk/config.mk
rename to programs/develop/libraries/framework/config.mk
diff --git a/programs/develop/libraries/framework/trunk/gpl3.txt b/programs/develop/libraries/framework/gpl3.txt
similarity index 100%
rename from programs/develop/libraries/framework/trunk/gpl3.txt
rename to programs/develop/libraries/framework/gpl3.txt
diff --git a/programs/develop/libraries/framework/trunk/include/defs.h b/programs/develop/libraries/framework/include/defs.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/defs.h
rename to programs/develop/libraries/framework/include/defs.h
diff --git a/programs/develop/libraries/framework/trunk/include/heap.h b/programs/develop/libraries/framework/include/heap.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/heap.h
rename to programs/develop/libraries/framework/include/heap.h
diff --git a/programs/develop/libraries/framework/trunk/include/ipc.h b/programs/develop/libraries/framework/include/ipc.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/ipc.h
rename to programs/develop/libraries/framework/include/ipc.h
diff --git a/programs/develop/libraries/framework/trunk/include/kolibri.h b/programs/develop/libraries/framework/include/kolibri.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/kolibri.h
rename to programs/develop/libraries/framework/include/kolibri.h
diff --git a/programs/develop/libraries/framework/trunk/include/malloc.h b/programs/develop/libraries/framework/include/malloc.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/malloc.h
rename to programs/develop/libraries/framework/include/malloc.h
diff --git a/programs/develop/libraries/framework/trunk/include/stdlib.h b/programs/develop/libraries/framework/include/stdlib.h
similarity index 100%
rename from programs/develop/libraries/framework/trunk/include/stdlib.h
rename to programs/develop/libraries/framework/include/stdlib.h
diff --git a/programs/develop/libraries/framework/trunk/kolibri/kolibri.c b/programs/develop/libraries/framework/kolibri/kolibri.c
similarity index 100%
rename from programs/develop/libraries/framework/trunk/kolibri/kolibri.c
rename to programs/develop/libraries/framework/kolibri/kolibri.c
diff --git a/programs/develop/libraries/framework/trunk/kolibri/makefile b/programs/develop/libraries/framework/kolibri/makefile
similarity index 100%
rename from programs/develop/libraries/framework/trunk/kolibri/makefile
rename to programs/develop/libraries/framework/kolibri/makefile
diff --git a/programs/develop/libraries/framework/trunk/libIPC/ipc.c b/programs/develop/libraries/framework/libIPC/ipc.c
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libIPC/ipc.c
rename to programs/develop/libraries/framework/libIPC/ipc.c
diff --git a/programs/develop/libraries/framework/trunk/libIPC/ipc.txt b/programs/develop/libraries/framework/libIPC/ipc.txt
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libIPC/ipc.txt
rename to programs/develop/libraries/framework/libIPC/ipc.txt
diff --git a/programs/develop/libraries/framework/trunk/libIPC/makefile b/programs/develop/libraries/framework/libIPC/makefile
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libIPC/makefile
rename to programs/develop/libraries/framework/libIPC/makefile
diff --git a/programs/develop/libraries/framework/trunk/libconfig/find_str.asm b/programs/develop/libraries/framework/libconfig/find_str.asm
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libconfig/find_str.asm
rename to programs/develop/libraries/framework/libconfig/find_str.asm
diff --git a/programs/develop/libraries/framework/trunk/libconfig/libconfig.asm b/programs/develop/libraries/framework/libconfig/libconfig.asm
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libconfig/libconfig.asm
rename to programs/develop/libraries/framework/libconfig/libconfig.asm
diff --git a/programs/develop/libraries/framework/trunk/libconfig/libini_p.asm b/programs/develop/libraries/framework/libconfig/libini_p.asm
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libconfig/libini_p.asm
rename to programs/develop/libraries/framework/libconfig/libini_p.asm
diff --git a/programs/develop/libraries/framework/trunk/libconfig/libini_p.inc b/programs/develop/libraries/framework/libconfig/libini_p.inc
similarity index 100%
rename from programs/develop/libraries/framework/trunk/libconfig/libini_p.inc
rename to programs/develop/libraries/framework/libconfig/libini_p.inc
diff --git a/programs/develop/libraries/framework/trunk/stdlib/heap.c b/programs/develop/libraries/framework/stdlib/heap.c
similarity index 100%
rename from programs/develop/libraries/framework/trunk/stdlib/heap.c
rename to programs/develop/libraries/framework/stdlib/heap.c
diff --git a/programs/develop/libraries/framework/trunk/stdlib/makefile b/programs/develop/libraries/framework/stdlib/makefile
similarity index 100%
rename from programs/develop/libraries/framework/trunk/stdlib/makefile
rename to programs/develop/libraries/framework/stdlib/makefile
diff --git a/programs/develop/libraries/framework/trunk/stdlib/malloc.c b/programs/develop/libraries/framework/stdlib/malloc.c
similarity index 100%
rename from programs/develop/libraries/framework/trunk/stdlib/malloc.c
rename to programs/develop/libraries/framework/stdlib/malloc.c
diff --git a/programs/develop/libraries/framework/trunk/stdlib/stdlib.c b/programs/develop/libraries/framework/stdlib/stdlib.c
similarity index 100%
rename from programs/develop/libraries/framework/trunk/stdlib/stdlib.c
rename to programs/develop/libraries/framework/stdlib/stdlib.c
diff --git a/programs/system/kobra/trunk/Makefile b/programs/system/kobra/trunk/Makefile
index 755f60901..ab1331c8e 100644
--- a/programs/system/kobra/trunk/Makefile
+++ b/programs/system/kobra/trunk/Makefile
@@ -1,6 +1,6 @@
-ROOT=../../../develop/libraries/framework/trunk
+ROOT=../../../develop/libraries/framework
 
-include ../../../develop/libraries/framework/trunk/config.mk
+include ../../../develop/libraries/framework/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