diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6490c0..77de2f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,40 +17,39 @@ set(SOURCES
   src/data.c
   src/epidemic_engine.c
   src/save.c
-  # ...
 )
+
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
-  # ...
+  assets/plague.png
+  assets/planes.png
+  assets/bground.png
+  assets/mutations.png
+  assets/cursor.png
+  assets/title.png
+  assets/dna.png
+  assets/explosion.png
+  assets/mutations_table/abilities_1.txt
+  assets/mutations_table/abilities_2.txt
+  assets/mutations_table/abilities_3.txt
+  assets/mutations_table/symptoms_1.txt
+  assets/mutations_table/symptoms_2.txt
+  assets/mutations_table/symptoms_3.txt
+  assets/mutations_table/symptoms_4.txt
+  assets/mutations_table/transmissions_1.txt
+  assets/mutations_table/transmissions_2.txt
+  assets/mutations_table/transmissions_3.txt
 )
 set(ASSETS_fx
-  assets-fx/plague.png
-  assets-fx/planes.png
-  assets-fx/bground.png
-  assets-fx/mutations.png
-  assets-fx/cursor.png
-  assets-fx/title.png
-  assets-fx/dna.png
-  assets-fx/explosion.png
-  assets-fx/mutations_table/abilities_1.txt
-  assets-fx/mutations_table/abilities_2.txt
-  assets-fx/mutations_table/abilities_3.txt
-  assets-fx/mutations_table/symptoms_1.txt
-  assets-fx/mutations_table/symptoms_2.txt
-  assets-fx/mutations_table/symptoms_3.txt
-  assets-fx/mutations_table/symptoms_4.txt
-  assets-fx/mutations_table/transmissions_1.txt
-  assets-fx/mutations_table/transmissions_2.txt
-  assets-fx/mutations_table/transmissions_3.txt
-  # ...
+
 )
 set(ASSETS_cg
-  assets-cg/example.png
-  # ...
+  
 )
 
 fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA)
-fxconv_declare_converters(assets-fx/converters.py)
+fxconv_declare_converters(assets/converters.py)
+
 
 add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}})
 target_compile_options(myaddin PRIVATE -Wall -Wextra -Os)
@@ -60,6 +59,6 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
   generate_g1a(TARGET myaddin OUTPUT "Plague.g1a"
     NAME "Plague" ICON assets-fx/icon.png)
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
-  generate_g3a(TARGET myaddin OUTPUT "MyAddin.g3a"
-    NAME "MyAddin" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+  generate_g3a(TARGET myaddin OUTPUT "Plague.g3a"
+    NAME "Plague" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
 endif()
diff --git a/Plague.g1a b/Plague.g1a
index f3827cf..17598eb 100644
Binary files a/Plague.g1a and b/Plague.g1a differ
diff --git a/Plague.g3a b/Plague.g3a
new file mode 100644
index 0000000..cfdc7ba
Binary files /dev/null and b/Plague.g3a differ
diff --git a/assets-cg/icon-sel.png b/assets-cg/icon-sel.png
new file mode 100644
index 0000000..7137b50
Binary files /dev/null and b/assets-cg/icon-sel.png differ
diff --git a/assets-cg/icon-uns.png b/assets-cg/icon-uns.png
new file mode 100644
index 0000000..3c99f62
Binary files /dev/null and b/assets-cg/icon-uns.png differ
diff --git a/assets/__pycache__/converters.cpython-39.pyc b/assets/__pycache__/converters.cpython-39.pyc
new file mode 100644
index 0000000..579b499
Binary files /dev/null and b/assets/__pycache__/converters.cpython-39.pyc differ
diff --git a/assets-fx/bground.png b/assets/bground.png
similarity index 100%
rename from assets-fx/bground.png
rename to assets/bground.png
diff --git a/assets-fx/converters.py b/assets/converters.py
similarity index 100%
rename from assets-fx/converters.py
rename to assets/converters.py
diff --git a/assets-fx/cursor.png b/assets/cursor.png
similarity index 100%
rename from assets-fx/cursor.png
rename to assets/cursor.png
diff --git a/assets-fx/dna.png b/assets/dna.png
similarity index 100%
rename from assets-fx/dna.png
rename to assets/dna.png
diff --git a/assets-fx/explosion.png b/assets/explosion.png
similarity index 100%
rename from assets-fx/explosion.png
rename to assets/explosion.png
diff --git a/assets-fx/fxconv-metadata.txt b/assets/fxconv-metadata.txt
similarity index 100%
rename from assets-fx/fxconv-metadata.txt
rename to assets/fxconv-metadata.txt
diff --git a/assets-fx/mutations.png b/assets/mutations.png
similarity index 100%
rename from assets-fx/mutations.png
rename to assets/mutations.png
diff --git a/assets-fx/mutations_table/abilities_1.txt b/assets/mutations_table/abilities_1.txt
similarity index 100%
rename from assets-fx/mutations_table/abilities_1.txt
rename to assets/mutations_table/abilities_1.txt
diff --git a/assets-fx/mutations_table/abilities_2.txt b/assets/mutations_table/abilities_2.txt
similarity index 100%
rename from assets-fx/mutations_table/abilities_2.txt
rename to assets/mutations_table/abilities_2.txt
diff --git a/assets-fx/mutations_table/abilities_3.txt b/assets/mutations_table/abilities_3.txt
similarity index 100%
rename from assets-fx/mutations_table/abilities_3.txt
rename to assets/mutations_table/abilities_3.txt
diff --git a/assets-fx/mutations_table/fxconv-metadata.txt b/assets/mutations_table/fxconv-metadata.txt
similarity index 100%
rename from assets-fx/mutations_table/fxconv-metadata.txt
rename to assets/mutations_table/fxconv-metadata.txt
diff --git a/assets-fx/mutations_table/symptoms_1.txt b/assets/mutations_table/symptoms_1.txt
similarity index 100%
rename from assets-fx/mutations_table/symptoms_1.txt
rename to assets/mutations_table/symptoms_1.txt
diff --git a/assets-fx/mutations_table/symptoms_2.txt b/assets/mutations_table/symptoms_2.txt
similarity index 100%
rename from assets-fx/mutations_table/symptoms_2.txt
rename to assets/mutations_table/symptoms_2.txt
diff --git a/assets-fx/mutations_table/symptoms_3.txt b/assets/mutations_table/symptoms_3.txt
similarity index 100%
rename from assets-fx/mutations_table/symptoms_3.txt
rename to assets/mutations_table/symptoms_3.txt
diff --git a/assets-fx/mutations_table/symptoms_4.txt b/assets/mutations_table/symptoms_4.txt
similarity index 100%
rename from assets-fx/mutations_table/symptoms_4.txt
rename to assets/mutations_table/symptoms_4.txt
diff --git a/assets-fx/mutations_table/transmissions_1.txt b/assets/mutations_table/transmissions_1.txt
similarity index 100%
rename from assets-fx/mutations_table/transmissions_1.txt
rename to assets/mutations_table/transmissions_1.txt
diff --git a/assets-fx/mutations_table/transmissions_2.txt b/assets/mutations_table/transmissions_2.txt
similarity index 100%
rename from assets-fx/mutations_table/transmissions_2.txt
rename to assets/mutations_table/transmissions_2.txt
diff --git a/assets-fx/mutations_table/transmissions_3.txt b/assets/mutations_table/transmissions_3.txt
similarity index 100%
rename from assets-fx/mutations_table/transmissions_3.txt
rename to assets/mutations_table/transmissions_3.txt
diff --git a/assets-fx/plague.png b/assets/plague.png
similarity index 100%
rename from assets-fx/plague.png
rename to assets/plague.png
diff --git a/assets-fx/planes.png b/assets/planes.png
similarity index 100%
rename from assets-fx/planes.png
rename to assets/planes.png
diff --git a/assets-fx/title.png b/assets/title.png
similarity index 100%
rename from assets-fx/title.png
rename to assets/title.png