diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c8bba..b6ba6dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(Gint 2.9 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1b or 2b
-set(COLORMODE_fx 1b)
+set(COLORMODE_fx 2b)
 #set the color mode either to 1b, 2b or EGA64
 set(COLORMODE_cg EGA64)
 
@@ -45,15 +45,15 @@ set(ASSETS_cg
 )
 
 set(ASSETS_cg_1b
-  assets-cg/levels/tileset1b_CG.png
+  assets-cg/1b/tileset/tileset1b_CG.png
 )
 
 set(ASSETS_cg_2b
-  assets-cg/levels/tileset2b_CG.png
+  assets-cg/2b/tileset/tileset2b_CG.png
 )
 
 set(ASSETS_cg_EGA64
-  assets-cg/levels/tilesetEGA64_CG.png
+  assets-cg/ega64/tileset/tilesetEGA64_CG.png
 )
 
 set(ASSETS_fx
@@ -69,12 +69,12 @@ set(ASSETS_fx
 )
 
 set(ASSETS_fx_1b
-  assets-fx/levels/tileset1b.png
+  assets-fx/1b/tileset/tileset1b.png
   # ...
 )
 
 set(ASSETS_fx_2b
-  assets-fx/levels/tileset2b.png
+  assets-fx/2b/tileset/tileset2b.png
   # ...
 )
 
@@ -116,31 +116,31 @@ target_link_libraries(myaddin LibProf::LibProf Gint::Gint)
 if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
 
   if("${COLORMODE_fx}" STREQUAL 1b)
-    generate_g1a(TARGET myaddin OUTPUT "PrjPC1b.g1a"
-      NAME "Col RPG NB" ICON assets-fx/icon1.png)
+    generate_g1a(TARGET myaddin OUTPUT "RPG_1b.g1a"
+      NAME "RPG PC 1b" ICON assets-fx/1b/icon1b.png)
   endif()
 
   if("${COLORMODE_fx}" STREQUAL 2b)
-    generate_g1a(TARGET myaddin OUTPUT "PrjPC2b.g1a"
-      NAME "Col RPG Grey" ICON assets-fx/icon2.png)
+    generate_g1a(TARGET myaddin OUTPUT "RPG_2b.g1a"
+      NAME "RPG PC 2b" ICON assets-fx/2b/icon2b.png)
   endif()
 
 
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
 
   if("${COLORMODE_cg}" STREQUAL 1b)
-  generate_g3a(TARGET myaddin OUTPUT "PrjPC1b.g3a"
-    NAME "Col RPG 1bit" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+  generate_g3a(TARGET myaddin OUTPUT "RPG_1b.g3a"
+    NAME "RPG PC 1b" ICONS assets-cg/1b/icon-uns-1b.png assets-cg/1b/icon-sel-1b.png)
   endif()
 
   if("${COLORMODE_cg}" STREQUAL 2b)
-    generate_g3a(TARGET myaddin OUTPUT "PrjPC2b.g3a"
-      NAME "Col RPG Grey" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+    generate_g3a(TARGET myaddin OUTPUT "RPG_2b.g3a"
+      NAME "RPG PC 2b" ICONS assets-cg/2b/icon-uns-2b.png assets-cg/2b/icon-sel-2b.png)
   endif()
 
   if("${COLORMODE_cg}" STREQUAL EGA64)
-    generate_g3a(TARGET myaddin OUTPUT "PrjPCega.g3a"
-      NAME "Col RPG EGA" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+    generate_g3a(TARGET myaddin OUTPUT "RPG_ega.g3a"
+      NAME "RPG PC EGA" ICONS assets-cg/ega64/icon-uns-ega64.png assets-cg/ega64/icon-sel-ega64.png)
   endif()
 
 endif()
diff --git a/assets-cg/1b/icon-sel-1b.png b/assets-cg/1b/icon-sel-1b.png
new file mode 100644
index 0000000..f5cf698
Binary files /dev/null and b/assets-cg/1b/icon-sel-1b.png differ
diff --git a/assets-cg/1b/icon-uns-1b.png b/assets-cg/1b/icon-uns-1b.png
new file mode 100644
index 0000000..d0718fa
Binary files /dev/null and b/assets-cg/1b/icon-uns-1b.png differ
diff --git a/assets-cg/1b/tileset/fxconv-metadata.txt b/assets-cg/1b/tileset/fxconv-metadata.txt
new file mode 100644
index 0000000..bd3621e
--- /dev/null
+++ b/assets-cg/1b/tileset/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+tileset1b_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
diff --git a/assets-cg/levels/tileset1b_CG.png b/assets-cg/1b/tileset/tileset1b_CG.png
similarity index 100%
rename from assets-cg/levels/tileset1b_CG.png
rename to assets-cg/1b/tileset/tileset1b_CG.png
diff --git a/assets-cg/2b/icon-sel-2b.png b/assets-cg/2b/icon-sel-2b.png
new file mode 100644
index 0000000..d09f65e
Binary files /dev/null and b/assets-cg/2b/icon-sel-2b.png differ
diff --git a/assets-cg/2b/icon-uns-2b.png b/assets-cg/2b/icon-uns-2b.png
new file mode 100644
index 0000000..18931d3
Binary files /dev/null and b/assets-cg/2b/icon-uns-2b.png differ
diff --git a/assets-cg/SpriteTestCG2b.png b/assets-cg/2b/sprites/SpriteTestCG2b.png
similarity index 100%
rename from assets-cg/SpriteTestCG2b.png
rename to assets-cg/2b/sprites/SpriteTestCG2b.png
diff --git a/assets-cg/2b/tileset/fxconv-metadata.txt b/assets-cg/2b/tileset/fxconv-metadata.txt
new file mode 100644
index 0000000..c6c7ba4
--- /dev/null
+++ b/assets-cg/2b/tileset/fxconv-metadata.txt
@@ -0,0 +1,4 @@
+tileset2b_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
+  
\ No newline at end of file
diff --git a/assets-cg/levels/tileset2b_CG.png b/assets-cg/2b/tileset/tileset2b_CG.png
similarity index 100%
rename from assets-cg/levels/tileset2b_CG.png
rename to assets-cg/2b/tileset/tileset2b_CG.png
diff --git a/assets-cg/ega64/icon-sel-ega64.png b/assets-cg/ega64/icon-sel-ega64.png
new file mode 100644
index 0000000..b97075f
Binary files /dev/null and b/assets-cg/ega64/icon-sel-ega64.png differ
diff --git a/assets-cg/ega64/icon-uns-ega64.png b/assets-cg/ega64/icon-uns-ega64.png
new file mode 100644
index 0000000..6ff24a1
Binary files /dev/null and b/assets-cg/ega64/icon-uns-ega64.png differ
diff --git a/assets-cg/ega64/tileset/fxconv-metadata.txt b/assets-cg/ega64/tileset/fxconv-metadata.txt
new file mode 100644
index 0000000..a32ba81
--- /dev/null
+++ b/assets-cg/ega64/tileset/fxconv-metadata.txt
@@ -0,0 +1,4 @@
+tilesetEGA64_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
+  
\ No newline at end of file
diff --git a/assets-cg/levels/tilesetEGA64_CG.png b/assets-cg/ega64/tileset/tilesetEGA64_CG.png
similarity index 100%
rename from assets-cg/levels/tilesetEGA64_CG.png
rename to assets-cg/ega64/tileset/tilesetEGA64_CG.png
diff --git a/assets-cg/levels/fxconv-metadata.txt b/assets-cg/levels/fxconv-metadata.txt
deleted file mode 100644
index de727b0..0000000
--- a/assets-cg/levels/fxconv-metadata.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tileset1b_CG.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
-tileset2b_CG.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
-tilesetEGA64_CG.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
diff --git a/assets-fx/1b/icon1b.png b/assets-fx/1b/icon1b.png
new file mode 100644
index 0000000..377610d
Binary files /dev/null and b/assets-fx/1b/icon1b.png differ
diff --git a/assets-fx/1b/tileset/fxconv-metadata.txt b/assets-fx/1b/tileset/fxconv-metadata.txt
new file mode 100644
index 0000000..d5e87d6
--- /dev/null
+++ b/assets-fx/1b/tileset/fxconv-metadata.txt
@@ -0,0 +1,4 @@
+tileset1b.png:
+  type: bopti-image
+  name: img_tilesetnpp
+
diff --git a/assets-fx/levels/backup/tileset1b.png b/assets-fx/1b/tileset/tileset1b.png
similarity index 100%
rename from assets-fx/levels/backup/tileset1b.png
rename to assets-fx/1b/tileset/tileset1b.png
diff --git a/assets-fx/2b/icon2b.png b/assets-fx/2b/icon2b.png
new file mode 100644
index 0000000..1d5e414
Binary files /dev/null and b/assets-fx/2b/icon2b.png differ
diff --git a/assets-fx/SpriteTest2b.png b/assets-fx/2b/sprites/SpriteTest2b.png
similarity index 100%
rename from assets-fx/SpriteTest2b.png
rename to assets-fx/2b/sprites/SpriteTest2b.png
diff --git a/assets-fx/2b/tileset/fxconv-metadata.txt b/assets-fx/2b/tileset/fxconv-metadata.txt
new file mode 100644
index 0000000..2548038
--- /dev/null
+++ b/assets-fx/2b/tileset/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+tileset2b.png:
+  type: bopti-image
+  name: img_tilesetnpp
diff --git a/assets-fx/levels/tileset2b.png b/assets-fx/2b/tileset/tileset2b.png
similarity index 100%
rename from assets-fx/levels/tileset2b.png
rename to assets-fx/2b/tileset/tileset2b.png
diff --git a/assets-fx/icon.png b/assets-fx/icon.png
deleted file mode 100644
index 7f0162d..0000000
Binary files a/assets-fx/icon.png and /dev/null differ
diff --git a/assets-fx/icon1.png b/assets-fx/icon1.png
deleted file mode 100644
index 33dc4c6..0000000
Binary files a/assets-fx/icon1.png and /dev/null differ
diff --git a/assets-fx/icon2.png b/assets-fx/icon2.png
deleted file mode 100644
index a5f1a72..0000000
Binary files a/assets-fx/icon2.png and /dev/null differ
diff --git a/assets-fx/levels/fxconv-metadata.txt b/assets-fx/levels/fxconv-metadata.txt
deleted file mode 100644
index 2075b25..0000000
--- a/assets-fx/levels/fxconv-metadata.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tileset1b.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
-  
-tileset2b.png:
-  type: bopti-image
-  name: img_tilesetnpp
diff --git a/assets-fx/levels/tileset1b.png b/assets-fx/levels/tileset1b.png
deleted file mode 100644
index 63f9c7b..0000000
Binary files a/assets-fx/levels/tileset1b.png and /dev/null differ