diff --git a/maidroid/models/maidroid.blend b/blend/maidroid.blend
similarity index 100%
rename from maidroid/models/maidroid.blend
rename to blend/maidroid.blend
diff --git a/maidroid/models/maidroid_mk1.png b/maidroid/models/maidroid_mk1.png
deleted file mode 100644
index ba4147a..0000000
Binary files a/maidroid/models/maidroid_mk1.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk10.png b/maidroid/models/maidroid_mk10.png
deleted file mode 100644
index 0bc25b2..0000000
Binary files a/maidroid/models/maidroid_mk10.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk11.png b/maidroid/models/maidroid_mk11.png
deleted file mode 100644
index 9204cd7..0000000
Binary files a/maidroid/models/maidroid_mk11.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk12.png b/maidroid/models/maidroid_mk12.png
deleted file mode 100644
index 000fdde..0000000
Binary files a/maidroid/models/maidroid_mk12.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk13.png b/maidroid/models/maidroid_mk13.png
deleted file mode 100644
index 7046d22..0000000
Binary files a/maidroid/models/maidroid_mk13.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk14.png b/maidroid/models/maidroid_mk14.png
deleted file mode 100644
index e67dcfe..0000000
Binary files a/maidroid/models/maidroid_mk14.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk15.png b/maidroid/models/maidroid_mk15.png
deleted file mode 100644
index cec82be..0000000
Binary files a/maidroid/models/maidroid_mk15.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk2.png b/maidroid/models/maidroid_mk2.png
deleted file mode 100644
index 2e9c8a5..0000000
Binary files a/maidroid/models/maidroid_mk2.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk3.png b/maidroid/models/maidroid_mk3.png
deleted file mode 100644
index e1a75e0..0000000
Binary files a/maidroid/models/maidroid_mk3.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk4.png b/maidroid/models/maidroid_mk4.png
deleted file mode 100644
index 375d87d..0000000
Binary files a/maidroid/models/maidroid_mk4.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk5.png b/maidroid/models/maidroid_mk5.png
deleted file mode 100644
index 73507b4..0000000
Binary files a/maidroid/models/maidroid_mk5.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk6.png b/maidroid/models/maidroid_mk6.png
deleted file mode 100644
index 74f3959..0000000
Binary files a/maidroid/models/maidroid_mk6.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk7.png b/maidroid/models/maidroid_mk7.png
deleted file mode 100644
index 9956981..0000000
Binary files a/maidroid/models/maidroid_mk7.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk8.png b/maidroid/models/maidroid_mk8.png
deleted file mode 100644
index 910ae95..0000000
Binary files a/maidroid/models/maidroid_mk8.png and /dev/null differ
diff --git a/maidroid/models/maidroid_mk9.png b/maidroid/models/maidroid_mk9.png
deleted file mode 100644
index 7e2288e..0000000
Binary files a/maidroid/models/maidroid_mk9.png and /dev/null differ
diff --git a/maidroid/models/scripts/generate_maidroid.sh b/maidroid/models/scripts/generate_maidroid.sh
deleted file mode 100644
index 1a0f38d..0000000
--- a/maidroid/models/scripts/generate_maidroid.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#/bin/bash
-
-declare -a arr=()
-arr[1]='gray92'
-arr[2]='gray68'
-arr[3]='gray36'
-arr[4]='gray17'
-arr[5]='blue'
-arr[6]='cyan'
-arr[7]='green'
-arr[8]='DarkGreen'
-arr[9]='yellow'
-arr[10]='orange'
-arr[11]='brown'
-arr[12]='red'
-arr[13]='pink'
-arr[14]='magenta'
-arr[15]='violet'
-
-for ((i=1; i<16; i++)); do
-  type=$(($i % 3 + 1)) 
-  maidroid_type="maidroid_type${type}.png"
-
-  output="../maidroid_maidroid_mk${i}.png"
-  color=${arr[i]}
-  convert +level-colors $color,White maidroid_hair.png maidroid_hair_tmp.png
-  composite maidroid_hair_tmp.png $maidroid_type $output
-
-  rm maidroid_hair_tmp.png
-done
diff --git a/maidroid/models/scripts/maidroid.png b/maidroid/models/scripts/maidroid.png
deleted file mode 100644
index 9c20ef7..0000000
Binary files a/maidroid/models/scripts/maidroid.png and /dev/null differ
diff --git a/maidroid/models/scripts/maidroid.xcf b/maidroid/models/scripts/maidroid.xcf
deleted file mode 100644
index 7308862..0000000
Binary files a/maidroid/models/scripts/maidroid.xcf and /dev/null differ
diff --git a/maidroid/textures/scripts/generate_egg.sh b/scripts/colors.sh
similarity index 50%
rename from maidroid/textures/scripts/generate_egg.sh
rename to scripts/colors.sh
index 342566e..f4f1b0c 100644
--- a/maidroid/textures/scripts/generate_egg.sh
+++ b/scripts/colors.sh
@@ -1,5 +1,3 @@
-#/bin/bash
-
 declare -a arr=()
 arr[1]='gray92'
 arr[2]='gray68'
@@ -16,12 +14,3 @@ arr[12]='red'
 arr[13]='pink'
 arr[14]='magenta'
 arr[15]='violet'
-
-for ((i=1; i<16; i++)); do
-  output="../maidroid_maidroid_mk${i}_egg.png"
-  color=${arr[i]}
-  convert +level-colors $color,White egg_pattern.png egg_pattern_tmp.png
-  composite egg_pattern_tmp.png egg.png $output
-
-  rm egg_pattern_tmp.png
-done
diff --git a/scripts/genEggTextures.sh b/scripts/genEggTextures.sh
new file mode 100644
index 0000000..29883fa
--- /dev/null
+++ b/scripts/genEggTextures.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+
+. ./colors.sh
+
+for ((i=1; i<16; i++)); do
+  output="../maidroid/textures/maidroid_maidroid_mk${i}_egg.png"
+  color=${arr[i]}
+  convert +level-colors $color,White img/maidroid_egg_pattern.png img/maidroid_egg_pattern_tmp.png
+  composite img/maidroid_egg_pattern_tmp.png img/maidroid_empty_egg.png $output
+
+  rm img/maidroid_egg_pattern_tmp.png
+done
diff --git a/scripts/genMaidroidTextures.sh b/scripts/genMaidroidTextures.sh
new file mode 100644
index 0000000..ae323d8
--- /dev/null
+++ b/scripts/genMaidroidTextures.sh
@@ -0,0 +1,15 @@
+#/bin/bash
+
+. ./colors.sh
+
+for ((i=1; i<16; i++)); do
+  type=$(($i % 3 + 1))
+  maidroid_type="img/maidroid_type${type}.png"
+
+  output="../maidroid/models/maidroid_maidroid_mk${i}.png"
+  color=${arr[i]}
+  convert +level-colors $color,White img/maidroid_hair.png img/maidroid_hair_tmp.png
+  composite img/maidroid_hair_tmp.png $maidroid_type $output
+
+  rm img/maidroid_hair_tmp.png
+done
diff --git a/maidroid/textures/scripts/egg_pattern.png b/scripts/img/maidroid_egg_pattern.png
similarity index 100%
rename from maidroid/textures/scripts/egg_pattern.png
rename to scripts/img/maidroid_egg_pattern.png
diff --git a/maidroid/textures/scripts/egg.png b/scripts/img/maidroid_empty_egg.png
similarity index 100%
rename from maidroid/textures/scripts/egg.png
rename to scripts/img/maidroid_empty_egg.png
diff --git a/maidroid/models/scripts/maidroid_hair.png b/scripts/img/maidroid_hair.png
similarity index 100%
rename from maidroid/models/scripts/maidroid_hair.png
rename to scripts/img/maidroid_hair.png
diff --git a/maidroid/models/scripts/maidroid_type1.png b/scripts/img/maidroid_type1.png
similarity index 100%
rename from maidroid/models/scripts/maidroid_type1.png
rename to scripts/img/maidroid_type1.png
diff --git a/maidroid/models/scripts/maidroid_type2.png b/scripts/img/maidroid_type2.png
similarity index 100%
rename from maidroid/models/scripts/maidroid_type2.png
rename to scripts/img/maidroid_type2.png
diff --git a/maidroid/models/scripts/maidroid_type3.png b/scripts/img/maidroid_type3.png
similarity index 100%
rename from maidroid/models/scripts/maidroid_type3.png
rename to scripts/img/maidroid_type3.png
diff --git a/maidroid_core/textures/maidroid_core_basic.xcf b/xcf/maidroid_core_basic.xcf
similarity index 100%
rename from maidroid_core/textures/maidroid_core_basic.xcf
rename to xcf/maidroid_core_basic.xcf
diff --git a/maidroid_core/textures/maidroid_core_empty.xcf b/xcf/maidroid_core_empty.xcf
similarity index 100%
rename from maidroid_core/textures/maidroid_core_empty.xcf
rename to xcf/maidroid_core_empty.xcf
diff --git a/maidroid_core/textures/maidroid_core_farming.xcf b/xcf/maidroid_core_farming.xcf
similarity index 100%
rename from maidroid_core/textures/maidroid_core_farming.xcf
rename to xcf/maidroid_core_farming.xcf
diff --git a/maidroid/textures/scripts/egg_pattern.xcf b/xcf/maidroid_egg_pattern.xcf
similarity index 100%
rename from maidroid/textures/scripts/egg_pattern.xcf
rename to xcf/maidroid_egg_pattern.xcf
diff --git a/maidroid/textures/maidroid_empty_egg.xcf b/xcf/maidroid_empty_egg.xcf
similarity index 100%
rename from maidroid/textures/maidroid_empty_egg.xcf
rename to xcf/maidroid_empty_egg.xcf
diff --git a/maidroid/models/scripts/maidroid_hair.xcf b/xcf/maidroid_hair.xcf
similarity index 100%
rename from maidroid/models/scripts/maidroid_hair.xcf
rename to xcf/maidroid_hair.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_right.xcf b/xcf/maidroid_tool_core_right.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_right.xcf
rename to xcf/maidroid_tool_core_right.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_top.xcf b/xcf/maidroid_tool_core_top.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_top.xcf
rename to xcf/maidroid_tool_core_top.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_writer_bottom.xcf b/xcf/maidroid_tool_core_writer_bottom.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_writer_bottom.xcf
rename to xcf/maidroid_tool_core_writer_bottom.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_writer_front.xcf b/xcf/maidroid_tool_core_writer_front.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_writer_front.xcf
rename to xcf/maidroid_tool_core_writer_front.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_writer_front_active.xcf b/xcf/maidroid_tool_core_writer_front_active.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_writer_front_active.xcf
rename to xcf/maidroid_tool_core_writer_front_active.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_writer_right.xcf b/xcf/maidroid_tool_core_writer_right.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_writer_right.xcf
rename to xcf/maidroid_tool_core_writer_right.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_core_writer_top.xcf b/xcf/maidroid_tool_core_writer_top.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_core_writer_top.xcf
rename to xcf/maidroid_tool_core_writer_top.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_egg_writer_bottom.xcf b/xcf/maidroid_tool_egg_writer_bottom.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_egg_writer_bottom.xcf
rename to xcf/maidroid_tool_egg_writer_bottom.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_egg_writer_front.xcf b/xcf/maidroid_tool_egg_writer_front.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_egg_writer_front.xcf
rename to xcf/maidroid_tool_egg_writer_front.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_egg_writer_front_active.xcf b/xcf/maidroid_tool_egg_writer_front_active.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_egg_writer_front_active.xcf
rename to xcf/maidroid_tool_egg_writer_front_active.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_egg_writer_right.xcf b/xcf/maidroid_tool_egg_writer_right.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_egg_writer_right.xcf
rename to xcf/maidroid_tool_egg_writer_right.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_egg_writer_top.xcf b/xcf/maidroid_tool_egg_writer_top.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_egg_writer_top.xcf
rename to xcf/maidroid_tool_egg_writer_top.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_gui_arrow.xcf b/xcf/maidroid_tool_gui_arrow.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_gui_arrow.xcf
rename to xcf/maidroid_tool_gui_arrow.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_gui_arrow_filled.xcf b/xcf/maidroid_tool_gui_arrow_filled.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_gui_arrow_filled.xcf
rename to xcf/maidroid_tool_gui_arrow_filled.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter.xcf b/xcf/maidroid_tool_gui_meter.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_gui_meter.xcf
rename to xcf/maidroid_tool_gui_meter.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter_filled.xcf b/xcf/maidroid_tool_gui_meter_filled.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_gui_meter_filled.xcf
rename to xcf/maidroid_tool_gui_meter_filled.xcf
diff --git a/maidroid_tool/textures/maidroid_tool_nametag.xcf b/xcf/maidroid_tool_nametag.xcf
similarity index 100%
rename from maidroid_tool/textures/maidroid_tool_nametag.xcf
rename to xcf/maidroid_tool_nametag.xcf
diff --git a/maidroid/models/scripts/maidroid_type1.xcf b/xcf/maidroid_type1.xcf
similarity index 100%
rename from maidroid/models/scripts/maidroid_type1.xcf
rename to xcf/maidroid_type1.xcf
diff --git a/maidroid/models/scripts/maidroid_type2.xcf b/xcf/maidroid_type2.xcf
similarity index 100%
rename from maidroid/models/scripts/maidroid_type2.xcf
rename to xcf/maidroid_type2.xcf
diff --git a/maidroid/models/scripts/maidroid_type3.xcf b/xcf/maidroid_type3.xcf
similarity index 100%
rename from maidroid/models/scripts/maidroid_type3.xcf
rename to xcf/maidroid_type3.xcf