diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/devutils/cputointel/CpuToIntel.c
index 18ff6bda9cd..196350f99f9 100644
--- a/rosapps/devutils/cputointel/CpuToIntel.c
+++ b/rosapps/devutils/cputointel/CpuToIntel.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 #include "misc.h"
 
 int main(int argc, char * argv[])
diff --git a/rosapps/devutils/cputointel/PPC/PPC.h b/rosapps/devutils/cputointel/From/PPC/PPC.h
similarity index 96%
rename from rosapps/devutils/cputointel/PPC/PPC.h
rename to rosapps/devutils/cputointel/From/PPC/PPC.h
index 3c5ed389393..4d9a7af4121 100644
--- a/rosapps/devutils/cputointel/PPC/PPC.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPC.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_INT PPCBrain(    CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.c b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/PPC/PPCBrain.c
rename to rosapps/devutils/cputointel/From/PPC/PPCBrain.c
index f5bb0a4c645..1b6314e5fdb 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "PPCBrain.h"
 #include "PPC.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 /* 
  * DummyBrain is example how you create you own cpu brain to translate from 
diff --git a/rosapps/devutils/cputointel/PPC/PPCBrain.h b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
similarity index 94%
rename from rosapps/devutils/cputointel/PPC/PPCBrain.h
rename to rosapps/devutils/cputointel/From/PPC/PPCBrain.h
index a2547b22f8d..5e33bd8cc50 100644
--- a/rosapps/devutils/cputointel/PPC/PPCBrain.h
+++ b/rosapps/devutils/cputointel/From/PPC/PPCBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 
 /* example how setup a opcode, this opcode is 16bit long (taken from M68K) 
diff --git a/rosapps/devutils/cputointel/PPC/PPCopcode.c b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
similarity index 98%
rename from rosapps/devutils/cputointel/PPC/PPCopcode.c
rename to rosapps/devutils/cputointel/From/PPC/PPCopcode.c
index 30c37854928..2d2bf2845d4 100644
--- a/rosapps/devutils/cputointel/PPC/PPCopcode.c
+++ b/rosapps/devutils/cputointel/From/PPC/PPCopcode.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h> 
 #include "PPC.h"
-#include "misc.h"
+#include "../../misc.h"
 
 
 /* cpuDummyInit_Add
diff --git a/rosapps/devutils/cputointel/dummycpu/Dummy.h b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
similarity index 96%
rename from rosapps/devutils/cputointel/dummycpu/Dummy.h
rename to rosapps/devutils/cputointel/From/dummycpu/Dummy.h
index fdc7117bf35..fab485df72a 100644
--- a/rosapps/devutils/cputointel/dummycpu/Dummy.h
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummy.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_INT DummyBrain(  CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/dummycpu/DummyBrain.c
rename to rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
index 5d82da1f769..db58c111b03 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "DummyBrain.h"
 #include "Dummy.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 
 
diff --git a/rosapps/devutils/cputointel/dummycpu/DummyBrain.h b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
similarity index 94%
rename from rosapps/devutils/cputointel/dummycpu/DummyBrain.h
rename to rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
index 3b9c7aaaa48..24248dd6d4c 100644
--- a/rosapps/devutils/cputointel/dummycpu/DummyBrain.h
+++ b/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 
 /* example how setup a opcode, this opcode is 16bit long (taken from M68K) 
diff --git a/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
similarity index 98%
rename from rosapps/devutils/cputointel/dummycpu/Dummyopcode.c
rename to rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
index 86e7d9355e0..51ae803dcac 100644
--- a/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c
+++ b/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h> 
 #include "Dummy.h"
-#include "misc.h"
+#include "../../misc.h"
 
 
 /* cpuDummyInit_Add
diff --git a/rosapps/devutils/cputointel/m68k/M68kBrain.c b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
similarity index 99%
rename from rosapps/devutils/cputointel/m68k/M68kBrain.c
rename to rosapps/devutils/cputointel/From/m68k/M68kBrain.c
index 99501a98180..df7417452be 100644
--- a/rosapps/devutils/cputointel/m68k/M68kBrain.c
+++ b/rosapps/devutils/cputointel/From/m68k/M68kBrain.c
@@ -3,7 +3,7 @@
 #include <stdlib.h> 
 #include "M68kBrain.h"
 #include "m68k.h"
-#include "../misc.h"
+#include "../../misc.h"
 
 /* retun 
  *         0            : Ok 
diff --git a/rosapps/devutils/cputointel/m68k/M68kBrain.h b/rosapps/devutils/cputointel/From/m68k/M68kBrain.h
similarity index 98%
rename from rosapps/devutils/cputointel/m68k/M68kBrain.h
rename to rosapps/devutils/cputointel/From/m68k/M68kBrain.h
index dfebd03e2d8..7fb28d14d41 100644
--- a/rosapps/devutils/cputointel/m68k/M68kBrain.h
+++ b/rosapps/devutils/cputointel/From/m68k/M68kBrain.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 
 CPU_BYTE cpuM68kInit_Abcd[16]      = {1,1,1,1,2,2,2,1,0,0,0,0,2,2,2,2}; 
 CPU_BYTE cpuM68kInit_Add[16]       = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2};
diff --git a/rosapps/devutils/cputointel/m68k/M68kopcode.c b/rosapps/devutils/cputointel/From/m68k/M68kopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/m68k/M68kopcode.c
rename to rosapps/devutils/cputointel/From/m68k/M68kopcode.c
diff --git a/rosapps/devutils/cputointel/m68k/m68k.h b/rosapps/devutils/cputointel/From/m68k/m68k.h
similarity index 99%
rename from rosapps/devutils/cputointel/m68k/m68k.h
rename to rosapps/devutils/cputointel/From/m68k/m68k.h
index 155e38dbee1..124e7a4349e 100644
--- a/rosapps/devutils/cputointel/m68k/m68k.h
+++ b/rosapps/devutils/cputointel/From/m68k/m68k.h
@@ -1,5 +1,5 @@
 
-#include "../misc.h"
+#include "../../misc.h"
 CPU_INT M68KBrain(   CPU_BYTE *cpu_buffer,
                      CPU_UNINT cpu_pos,
                      CPU_UNINT cpu_size,
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/devutils/cputointel/ImageLoader.c
index 360b08b4bfd..7570745e45c 100644
--- a/rosapps/devutils/cputointel/ImageLoader.c
+++ b/rosapps/devutils/cputointel/ImageLoader.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include "misc.h"
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 
 /*
  *
diff --git a/rosapps/devutils/cputointel/cputointel.rbuild b/rosapps/devutils/cputointel/cputointel.rbuild
index 23420558721..68288bbf0d1 100644
--- a/rosapps/devutils/cputointel/cputointel.rbuild
+++ b/rosapps/devutils/cputointel/cputointel.rbuild
@@ -13,13 +13,13 @@
 	<file>ARM/ARMBrain.c</file>
 	<file>ARM/ARMopcode.c</file>
 
-	<file>m68k/M68kBrain.c</file>
-	<file>m68k/M68kopcode.c</file>
+	<file>From/m68k/M68kBrain.c</file>
+	<file>From/m68k/M68kopcode.c</file>
 
-	<file>PPC/PPCBrain.c</file>
-	<file>PPC/PPCopcode.c</file>
+	<file>From/PPC/PPCBrain.c</file>
+	<file>From/PPC/PPCopcode.c</file>
 
-	<file>dummycpu/DummyBrain.c</file>
-	<file>dummycpu/Dummyopcode.c</file>
+	<file>From/dummycpu/DummyBrain.c</file>
+	<file>From/dummycpu/Dummyopcode.c</file>
 
 </module>
\ No newline at end of file
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/devutils/cputointel/misc.c
index beef898205e..f291b76ad21 100644
--- a/rosapps/devutils/cputointel/misc.c
+++ b/rosapps/devutils/cputointel/misc.c
@@ -8,8 +8,8 @@
 #include <string.h>
 #include "misc.h"
 #include "ARM/ARM.h"
-#include "m68k/m68k.h"
-#include "PPC/PPC.h"
+#include "From/m68k/m68k.h"
+#include "From/PPC/PPC.h"
 
 
 /* retun