71 files changed, 125 insertions, 133 deletions

diff --git a/build.lua b/build.lua
index bc32ad8..07017dc 100755
--- a/build.lua
+++ b/build.lua
@@ -86,7 +86,7 @@ CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
 LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit')
 libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl'
 LFLAGS = '-d'
-EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media'
+EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media'
 
 
 if 'nil' == type(args) then
diff --git a/media/FemaleTeen_741.mtl b/media/FemaleTeen_741.mtl
deleted file mode 100644
index 17e2ebe..0000000
--- a/media/FemaleTeen_741.mtl
+++ /dev/null
@@ -1,66 +0,0 @@
-# MakeHuman exported MTL
-# www.makehuman.org
-
-
-newmtl young_asian_female
-Kd 1 0.95 0.85
-Ks 0.02745 0.02745 0.02745
-d 0
-map_Kd textures/young_lightskinned_female_diffuse.png
-map_D textures/young_lightskinned_female_diffuse.png
-
-newmtl female01Material
-Kd 1 1 1
-Ks 0.2 0.2 0.2
-d 0
-map_Kd textures/diffuse_blonde.png
-map_D textures/diffuse_blonde.png
-
-newmtl Eye_brown
-Kd 1 1 1
-Ks 1 1 1
-d 0
-map_Kd textures/brown_eye.png
-map_D textures/brown_eye.png
-
-newmtl eyebrow001
-Kd 1 1 1
-Ks 0 0 0
-d 0
-map_Kd textures/eyebrow001.png
-map_D textures/eyebrow001.png
-
-newmtl bodyMaterial
-Kd 1 1 1
-Ks 0 0 0
-d 0
-map_Kd textures/eyelashes03.png
-map_D textures/eyelashes03.png
-
-newmtl teethMaterial
-Kd 0.64 0.64 0.64
-Ks 0.8549 0.8549 0.8549
-d 0
-map_Kd textures/teeth.png
-map_D textures/teeth.png
-
-newmtl tongue01Material
-Kd 1 1 1
-Ks 0.03137 0.03137 0.03137
-d 0
-map_Kd textures/tongue01_diffuse.png
-map_D textures/tongue01_diffuse.png
-
-newmtl TShirtWhite
-Kd 1 1 1
-Ks 0.07059 0.07059 0.07059
-d 0
-map_Kd textures/tshirt_texture_white.png
-map_D textures/tshirt_texture_white.png
-
-newmtl short01blacksatin
-Kd 1 1 1
-Ks 0.5 0.5 0.5
-d 0
-map_Kd textures/short01_black_diffuse.png
-map_D textures/short01_black_diffuse.png
diff --git a/media/Test%20sim/FemaleTeen.omg b/media/Test%20sim/FemaleTeen.omg
index 235916c..cd2e8c3 100644
--- a/media/Test%20sim/FemaleTeen.omg
+++ b/media/Test%20sim/FemaleTeen.omg
@@ -9,23 +9,23 @@ Stuffs =
   {
     Mesh = 
     {
-      fileName = 'FemaleTeen_741.obj',
+      fileName = 'models/FemaleTeen_741.obj',
       kind = 'mesh',
       materials =
       {
-        [0]  = {kind = 'face',   texture = 'textures/blue_eye.png'},
-        [1]  = {kind = 'face',   texture = 'textures/diffuse_blonde.png'},
-        [2]  = {kind = 'face',   texture = 'textures/eyebrow001.png'},
-        [3]  = {kind = 'face',   texture = 'textures/eyelashes03.png'},
-        [4]  = {kind = 'normal', texture = 'textures/normals.png'},
-        [5]  = {kind = 'face',   texture = 'textures/short01_black_diffuse.png'},
-        [6]  = {kind = 'normal', texture = 'textures/short01_normals.png'},
-        [7]  = {kind = 'face',   texture = 'textures/teeth.png'},
-        [8]  = {kind = 'face',   texture = 'textures/tongue01_diffuse.png'},
-        [9]  = {kind = 'face',   texture = 'textures/tshirt_displacement.png'},
-        [10] = {kind = 'normal', texture = 'textures/tshirt_normal.png'},
-        [11] = {kind = 'face',   texture = 'textures/tshirt_texture_white.png'},
-        [12] = {kind = 'face',   texture = 'textures/young_lightskinned_female_diffuse.png'},
+        [0]  = {kind = 'face',   texture = 'images/blue_eye.png'},
+        [1]  = {kind = 'face',   texture = 'images/diffuse_blonde.png'},
+        [2]  = {kind = 'face',   texture = 'images/eyebrow001.png'},
+        [3]  = {kind = 'face',   texture = 'images/eyelashes03.png'},
+        [4]  = {kind = 'normal', texture = 'images/normals.png'},
+        [5]  = {kind = 'face',   texture = 'images/short01_black_diffuse.png'},
+        [6]  = {kind = 'normal', texture = 'images/short01_normals.png'},
+        [7]  = {kind = 'face',   texture = 'images/teeth.png'},
+        [8]  = {kind = 'face',   texture = 'images/tongue01_diffuse.png'},
+        [9]  = {kind = 'face',   texture = 'images/tshirt_displacement.png'},
+        [10] = {kind = 'normal', texture = 'images/tshirt_normal.png'},
+        [11] = {kind = 'face',   texture = 'images/tshirt_texture_white.png'},
+        [12] = {kind = 'face',   texture = 'images/young_lightskinned_female_diffuse.png'},
       },
     },
   },
diff --git a/media/Test%20sim/Rough_Hir.omg b/media/Test%20sim/Rough_Hir.omg
index 2f7a130..82ec204 100644
--- a/media/Test%20sim/Rough_Hir.omg
+++ b/media/Test%20sim/Rough_Hir.omg
@@ -9,11 +9,11 @@ Stuffs =
   {
     Mesh = 
     {
-      fileName = 'Rough_Hir_smooth.obj',
+      fileName = 'models/Rough_Hir_smooth.obj',
       kind = 'mesh',
       materials =
       {
-        [0] = {kind = 'face',   texture = 'textures/normals.png'},
+        [0] = {kind = 'face',   texture = 'images/normals.png'},
       },
     },
   },
diff --git a/media/Test%20sim/earth.omg b/media/Test%20sim/earth.omg
index 88b8430..f3de804 100644
--- a/media/Test%20sim/earth.omg
+++ b/media/Test%20sim/earth.omg
@@ -13,7 +13,7 @@ Stuffs =
 -- insert prim parameters here
       materials =
       {
-        [0] = {kind = 'face', texture = 'EarthDiffuse.png'},
+        [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
       },
     },
   },
diff --git a/media/Test%20sim/onefang%27s%20test%20bed.omg b/media/Test%20sim/onefang%27s%20test%20bed.omg
index 1e86837..ca95411 100644
--- a/media/Test%20sim/onefang%27s%20test%20bed.omg
+++ b/media/Test%20sim/onefang%27s%20test%20bed.omg
@@ -12,7 +12,7 @@ Stuffs =
       kind = 'cube',
       materials =
       {
-        [0] = {kind = 'normal', texture = 'normal_lego.png'},
+        [0] = {kind = 'normal', texture = 'images/normal_lego.png'},
       },
 --[[
       parts = 
@@ -24,7 +24,7 @@ Stuffs =
           rot = { , , , ,},
           materials =
           {
-            [0] = {kind = 'face', texture = 'sonic.png'},
+            [0] = {kind = 'face', texture = 'images/sonic.png'},
           },
         },
         ['earth'] = 
@@ -34,7 +34,7 @@ Stuffs =
           rot = { , , , ,},
           materials =
           {
-            [0] = {kind = 'face', texture = 'EarthDiffuse.png'},
+            [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
           },
         },
       },
diff --git a/media/Test%20sim/onefang.omg b/media/Test%20sim/onefang.omg
index ee7c9e9..e9a1509 100644
--- a/media/Test%20sim/onefang.omg
+++ b/media/Test%20sim/onefang.omg
@@ -9,19 +9,19 @@ Stuffs =
   {
     Mesh = 
     {
-      fileName = 'onefang_741.obj',
+      fileName = 'models/onefang_741.obj',
       kind = 'mesh',
       materials =
       {
-        [0]  = {kind = 'face',   texture = 'map_D textures/Moustache_black_diff.png'},
-        [1]  = {kind = 'face',   texture = 'map_D textures/brown_eye.png'},
-        [2]  = {kind = 'face',   texture = 'map_D textures/eyebrow008.png'},
-        [3]  = {kind = 'face',   texture = 'map_D textures/eyelashes01.png'},
-        [4]  = {kind = 'face',   texture = 'map_D textures/tongue01_diffuse.png'},
-        [5]  = {kind = 'face',   texture = 'map_D textures/toenail_natural_diff.png'},
-        [6]  = {kind = 'face',   texture = 'map_D textures/worksuit_diffuse.png'},
-        [7]  = {kind = 'face',   texture = 'map_D textures/Full_beard_black_diff.png'},
-        [8]  = {kind = 'face',   texture = 'map_D textures/Glasses2.png'},
+        [0]  = {kind = 'face',   texture = 'map_D images/Moustache_black_diff.png'},
+        [1]  = {kind = 'face',   texture = 'map_D images/brown_eye.png'},
+        [2]  = {kind = 'face',   texture = 'map_D images/eyebrow008.png'},
+        [3]  = {kind = 'face',   texture = 'map_D images/eyelashes01.png'},
+        [4]  = {kind = 'face',   texture = 'map_D images/tongue01_diffuse.png'},
+        [5]  = {kind = 'face',   texture = 'map_D images/toenail_natural_diff.png'},
+        [6]  = {kind = 'face',   texture = 'map_D images/worksuit_diffuse.png'},
+        [7]  = {kind = 'face',   texture = 'map_D images/Full_beard_black_diff.png'},
+        [8]  = {kind = 'face',   texture = 'map_D images/Glasses2.png'},
       },
     },
   },
diff --git a/media/Test%20sim/sonic.omg b/media/Test%20sim/sonic.omg
index 1b33e4f..c3d1df8 100644
--- a/media/Test%20sim/sonic.omg
+++ b/media/Test%20sim/sonic.omg
@@ -9,11 +9,11 @@ Stuffs =
   {
     Mesh = 
     {
-      fileName = 'sonic.md2',
+      fileName = 'models/sonic.md2',
       kind = 'mesh',
       materials =
       {
-        [0] = {kind = 'face', texture = 'sonic.png'},
+        [0] = {kind = 'face', texture = 'images/sonic.png'},
       },
     },
   },
diff --git a/media/Test%20sim/sweet_home.omg b/media/Test%20sim/sweet_home.omg
index 65ffa24..9f4e583 100644
--- a/media/Test%20sim/sweet_home.omg
+++ b/media/Test%20sim/sweet_home.omg
@@ -9,11 +9,11 @@ Stuffs =
   {
     Mesh = 
     {
-      fileName = 'sweet_home.obj',
+      fileName = 'models/sweet_home.obj',
       kind = 'mesh',
       materials =
       {
-        [0] = {kind = 'face', texture = 'sweet_home_reversed.png'},
+        [0] = {kind = 'face', texture = 'images/sweet_home_reversed.png'},
       },
     },
   },
diff --git a/media/Test%20sim/terrain.omg b/media/Test%20sim/terrain.omg
index b4edf81..bc3ef3e 100644
--- a/media/Test%20sim/terrain.omg
+++ b/media/Test%20sim/terrain.omg
@@ -13,7 +13,7 @@ Stuffs =
 -- insert prim parameters here
       materials =
       {
-        [0] = {kind = 'face', texture = 'EarthDiffuse.png'},
+        [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
       },
     },
   },
diff --git a/media/animated_logo.gif b/media/animated_logo.gif
deleted file mode 100644
index ef201af..0000000
--- a/media/animated_logo.gif
+++ /dev/null
diff --git a/media/cube.lua b/media/cube.lua
deleted file mode 100644
index dca9b0b..0000000
--- a/media/cube.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-Shape =
-{
-  kind = 'cube'
-}
diff --git a/media/earth.lua b/media/earth.lua
deleted file mode 100644
index 8ddf610..0000000
--- a/media/earth.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-Shape =
-{
-  kind = 'sphere'
-}
diff --git a/media/EarthDiffuse.png b/media/images/EarthDiffuse.png
index 3bcf58b..3bcf58b 100644
--- a/media/EarthDiffuse.png
+++ b/media/images/EarthDiffuse.png
diff --git a/media/textures/Full_beard_black_diff.png b/media/images/Full_beard_black_diff.png
index b5b1aac..b5b1aac 100644
--- a/media/textures/Full_beard_black_diff.png
+++ b/media/images/Full_beard_black_diff.png
diff --git a/media/textures/Glasses2.png b/media/images/Glasses2.png
index a2c1be0..a2c1be0 100644
--- a/media/textures/Glasses2.png
+++ b/media/images/Glasses2.png
diff --git a/media/textures/Moustache_black_diff.png b/media/images/Moustache_black_diff.png
index f38910a..f38910a 100644
--- a/media/textures/Moustache_black_diff.png
+++ b/media/images/Moustache_black_diff.png
diff --git a/media/textures/blue_eye.png b/media/images/blue_eye.png
index 2b8c06a..2b8c06a 100644
--- a/media/textures/blue_eye.png
+++ b/media/images/blue_eye.png
diff --git a/media/textures/brown_eye.png b/media/images/brown_eye.png
index 3244499..3244499 100644
--- a/media/textures/brown_eye.png
+++ b/media/images/brown_eye.png
diff --git a/media/bubble.png b/media/images/bubble.png
index 8fc50f9..8fc50f9 100644
--- a/media/bubble.png
+++ b/media/images/bubble.png
diff --git a/media/bubble_sh.png b/media/images/bubble_sh.png
index b66c1e6..b66c1e6 100644
--- a/media/bubble_sh.png
+++ b/media/images/bubble_sh.png
diff --git a/media/cube-blue.png b/media/images/cube-blue.png
index e848d2b..e848d2b 100644
--- a/media/cube-blue.png
+++ b/media/images/cube-blue.png
diff --git a/media/cube-purple.png b/media/images/cube-purple.png
index 096cdbb..096cdbb 100644
--- a/media/cube-purple.png
+++ b/media/images/cube-purple.png
diff --git a/media/textures/diffuse_blonde.png b/media/images/diffuse_blonde.png
index e75f740..e75f740 100644
--- a/media/textures/diffuse_blonde.png
+++ b/media/images/diffuse_blonde.png
diff --git a/media/textures/eyebrow001.png b/media/images/eyebrow001.png
index 25410f9..25410f9 100644
--- a/media/textures/eyebrow001.png
+++ b/media/images/eyebrow001.png
diff --git a/media/textures/eyebrow008.png b/media/images/eyebrow008.png
index b6993bb..b6993bb 100644
--- a/media/textures/eyebrow008.png
+++ b/media/images/eyebrow008.png
diff --git a/media/textures/eyelashes01.png b/media/images/eyelashes01.png
index 76bd0db..76bd0db 100644
--- a/media/textures/eyelashes01.png
+++ b/media/images/eyelashes01.png
diff --git a/media/textures/eyelashes03.png b/media/images/eyelashes03.png
index ab849b2..ab849b2 100644
--- a/media/textures/eyelashes03.png
+++ b/media/images/eyelashes03.png
diff --git a/media/logo.png b/media/images/logo.png
index 7dbae67..7dbae67 100644
--- a/media/logo.png
+++ b/media/images/logo.png
diff --git a/media/textures/normals.png b/media/images/normals.png
index cbf429a..cbf429a 100644
--- a/media/textures/normals.png
+++ b/media/images/normals.png
diff --git a/media/plant_01.jpg b/media/images/plant_01.jpg
index f1714dd..f1714dd 100644
--- a/media/plant_01.jpg
+++ b/media/images/plant_01.jpg
diff --git a/media/pt.png b/media/images/pt.png
index 612d117..612d117 100644
--- a/media/pt.png
+++ b/media/images/pt.png
diff --git a/media/rock_01.jpg b/media/images/rock_01.jpg
index c50ccb3..c50ccb3 100644
--- a/media/rock_01.jpg
+++ b/media/images/rock_01.jpg
diff --git a/media/rock_02.jpg b/media/images/rock_02.jpg
index 04aea8a..04aea8a 100644
--- a/media/rock_02.jpg
+++ b/media/images/rock_02.jpg
diff --git a/media/textures/short01_black_diffuse.png b/media/images/short01_black_diffuse.png
index 43d0d18..43d0d18 100644
--- a/media/textures/short01_black_diffuse.png
+++ b/media/images/short01_black_diffuse.png
diff --git a/media/textures/short01_normals.png b/media/images/short01_normals.png
index 5cf9765..5cf9765 100644
--- a/media/textures/short01_normals.png
+++ b/media/images/short01_normals.png
diff --git a/media/sky_01.jpg b/media/images/sky_01.jpg
index 22f3050..22f3050 100644
--- a/media/sky_01.jpg
+++ b/media/images/sky_01.jpg
diff --git a/media/sky_02.jpg b/media/images/sky_02.jpg
index d0d7448..d0d7448 100644
--- a/media/sky_02.jpg
+++ b/media/images/sky_02.jpg
diff --git a/media/sky_03.jpg b/media/images/sky_03.jpg
index cbad02a..cbad02a 100644
--- a/media/sky_03.jpg
+++ b/media/images/sky_03.jpg
diff --git a/media/sky_04.jpg b/media/images/sky_04.jpg
index c5cbc18..c5cbc18 100644
--- a/media/sky_04.jpg
+++ b/media/images/sky_04.jpg
diff --git a/media/sonic.png b/media/images/sonic.png
index 01cb2ed..01cb2ed 100644
--- a/media/sonic.png
+++ b/media/images/sonic.png
diff --git a/media/spacer.png b/media/images/spacer.png
index bf91fa5..bf91fa5 100644
--- a/media/spacer.png
+++ b/media/images/spacer.png
diff --git a/media/sweet_home_reversed.png b/media/images/sweet_home_reversed.png
index d535c13..d535c13 100644
--- a/media/sweet_home_reversed.png
+++ b/media/images/sweet_home_reversed.png
diff --git a/media/textures/teeth.png b/media/images/teeth.png
index 338b9e2..338b9e2 100644
--- a/media/textures/teeth.png
+++ b/media/images/teeth.png
diff --git a/media/test.png b/media/images/test.png
index fb620d7..fb620d7 100644
--- a/media/test.png
+++ b/media/images/test.png
diff --git a/media/textures/toenail_natural_diff.png b/media/images/toenail_natural_diff.png
index 5274716..5274716 100644
--- a/media/textures/toenail_natural_diff.png
+++ b/media/images/toenail_natural_diff.png
diff --git a/media/textures/toenails_diff.png b/media/images/toenails_diff.png
index 3b46274..3b46274 100644
--- a/media/textures/toenails_diff.png
+++ b/media/images/toenails_diff.png
diff --git a/media/textures/tongue01_diffuse.png b/media/images/tongue01_diffuse.png
index a61ec57..a61ec57 100644
--- a/media/textures/tongue01_diffuse.png
+++ b/media/images/tongue01_diffuse.png
diff --git a/media/textures/tshirt_displacement.png b/media/images/tshirt_displacement.png
index cac3b35..cac3b35 100644
--- a/media/textures/tshirt_displacement.png
+++ b/media/images/tshirt_displacement.png
diff --git a/media/textures/tshirt_normal.png b/media/images/tshirt_normal.png
index 7293538..7293538 100644
--- a/media/textures/tshirt_normal.png
+++ b/media/images/tshirt_normal.png
diff --git a/media/textures/tshirt_texture_blue.png b/media/images/tshirt_texture_blue.png
index 09be2ac..09be2ac 100644
--- a/media/textures/tshirt_texture_blue.png
+++ b/media/images/tshirt_texture_blue.png
diff --git a/media/textures/tshirt_texture_white.png b/media/images/tshirt_texture_white.png
index a486db7..a486db7 100644
--- a/media/textures/tshirt_texture_white.png
+++ b/media/images/tshirt_texture_white.png
diff --git a/media/textures/worksuit_diffuse.png b/media/images/worksuit_diffuse.png
index 0b33cd4..0b33cd4 100644
--- a/media/textures/worksuit_diffuse.png
+++ b/media/images/worksuit_diffuse.png
diff --git a/media/textures/worksuit_normals.png b/media/images/worksuit_normals.png
index 8238bdd..8238bdd 100644
--- a/media/textures/worksuit_normals.png
+++ b/media/images/worksuit_normals.png
diff --git a/media/textures/young_lightskinned_female_diffuse.png b/media/images/young_lightskinned_female_diffuse.png
index 8e58341..8e58341 100644
--- a/media/textures/young_lightskinned_female_diffuse.png
+++ b/media/images/young_lightskinned_female_diffuse.png
diff --git a/media/textures/young_lightskinned_female_genuine_genitals_diffuse.png b/media/images/young_lightskinned_female_genuine_genitals_diffuse.png
index 66c92af..66c92af 100644
--- a/media/textures/young_lightskinned_female_genuine_genitals_diffuse.png
+++ b/media/images/young_lightskinned_female_genuine_genitals_diffuse.png
diff --git a/media/logo_small.png b/media/logo_small.png
deleted file mode 100644
index c7dc665..0000000
--- a/media/logo_small.png
+++ /dev/null
diff --git a/media/models/FemaleTeen_741.mtl b/media/models/FemaleTeen_741.mtl
new file mode 100644
index 0000000..0263a3e
--- /dev/null
+++ b/media/models/FemaleTeen_741.mtl
@@ -0,0 +1,66 @@
+# MakeHuman exported MTL
+# www.makehuman.org
+
+
+newmtl young_asian_female
+Kd 1 0.95 0.85
+Ks 0.02745 0.02745 0.02745
+d 0
+map_Kd images/young_lightskinned_female_diffuse.png
+map_D images/young_lightskinned_female_diffuse.png
+
+newmtl female01Material
+Kd 1 1 1
+Ks 0.2 0.2 0.2
+d 0
+map_Kd images/diffuse_blonde.png
+map_D images/diffuse_blonde.png
+
+newmtl Eye_brown
+Kd 1 1 1
+Ks 1 1 1
+d 0
+map_Kd images/brown_eye.png
+map_D images/brown_eye.png
+
+newmtl eyebrow001
+Kd 1 1 1
+Ks 0 0 0
+d 0
+map_Kd images/eyebrow001.png
+map_D images/eyebrow001.png
+
+newmtl bodyMaterial
+Kd 1 1 1
+Ks 0 0 0
+d 0
+map_Kd images/eyelashes03.png
+map_D images/eyelashes03.png
+
+newmtl teethMaterial
+Kd 0.64 0.64 0.64
+Ks 0.8549 0.8549 0.8549
+d 0
+map_Kd images/teeth.png
+map_D images/teeth.png
+
+newmtl tongue01Material
+Kd 1 1 1
+Ks 0.03137 0.03137 0.03137
+d 0
+map_Kd images/tongue01_diffuse.png
+map_D images/tongue01_diffuse.png
+
+newmtl TShirtWhite
+Kd 1 1 1
+Ks 0.07059 0.07059 0.07059
+d 0
+map_Kd images/tshirt_texture_white.png
+map_D images/tshirt_texture_white.png
+
+newmtl short01blacksatin
+Kd 1 1 1
+Ks 0.5 0.5 0.5
+d 0
+map_Kd images/short01_black_diffuse.png
+map_D images/short01_black_diffuse.png
diff --git a/media/FemaleTeen_741.obj b/media/models/FemaleTeen_741.obj
index 6947af2..6947af2 100644
--- a/media/FemaleTeen_741.obj
+++ b/media/models/FemaleTeen_741.obj
diff --git a/media/Rough_Hir_raw.mtl b/media/models/Rough_Hir_raw.mtl
index 6f4844e..6f4844e 100644
--- a/media/Rough_Hir_raw.mtl
+++ b/media/models/Rough_Hir_raw.mtl
diff --git a/media/Rough_Hir_raw.obj b/media/models/Rough_Hir_raw.obj
index 28d18c3..28d18c3 100644
--- a/media/Rough_Hir_raw.obj
+++ b/media/models/Rough_Hir_raw.obj
diff --git a/media/Rough_Hir_smooth.mtl b/media/models/Rough_Hir_smooth.mtl
index 6f4844e..6f4844e 100644
--- a/media/Rough_Hir_smooth.mtl
+++ b/media/models/Rough_Hir_smooth.mtl
diff --git a/media/Rough_Hir_smooth.obj b/media/models/Rough_Hir_smooth.obj
index 1391975..1391975 100644
--- a/media/Rough_Hir_smooth.obj
+++ b/media/models/Rough_Hir_smooth.obj
diff --git a/media/onefang_741.mtl b/media/models/onefang_741.mtl
index 36734b2..aa6b2d8 100644
--- a/media/onefang_741.mtl
+++ b/media/models/onefang_741.mtl
@@ -11,61 +11,61 @@ newmtl materialMaterial
 Kd 1 1 1
 Ks 0.0002166 0.0002166 0.0002166
 d 0
-map_Kd textures/Moustache_black_diff.png
-map_D textures/Moustache_black_diff.png
+map_Kd images/Moustache_black_diff.png
+map_D images/Moustache_black_diff.png
 
 newmtl Eye_brown
 Kd 1 1 1
 Ks 1 1 1
 d 0
-map_Kd textures/brown_eye.png
-map_D textures/brown_eye.png
+map_Kd images/brown_eye.png
+map_D images/brown_eye.png
 
 newmtl eyebrow008
 Kd 1 1 1
 Ks 0 0 0
 d 0
-map_Kd textures/eyebrow008.png
-map_D textures/eyebrow008.png
+map_Kd images/eyebrow008.png
+map_D images/eyebrow008.png
 
 newmtl bodyMaterial
 Kd 1 1 1
 Ks 0 0 0
 d 0
-map_Kd textures/eyelashes01.png
-map_D textures/eyelashes01.png
+map_Kd images/eyelashes01.png
+map_D images/eyelashes01.png
 
 newmtl tongue01Material
 Kd 1 1 1
 Ks 0.03137 0.03137 0.03137
 d 0
-map_Kd textures/tongue01_diffuse.png
-map_D textures/tongue01_diffuse.png
+map_Kd images/tongue01_diffuse.png
+map_D images/tongue01_diffuse.png
 
 newmtl fingernails_female_naturalMaterial
 Kd 0.64 0.64 0.64
 Ks 0.2 0.2 0.2
 d 0
-map_Kd textures/toenail_natural_diff.png
-map_D textures/toenail_natural_diff.png
+map_Kd images/toenail_natural_diff.png
+map_D images/toenail_natural_diff.png
 
 newmtl worksuit
 Kd 1 1 1
 Ks 0.03137 0.03137 0.03137
 d 0
-map_Kd textures/worksuit_diffuse.png
-map_D textures/worksuit_diffuse.png
+map_Kd images/worksuit_diffuse.png
+map_D images/worksuit_diffuse.png
 
 newmtl full_beardMaterial
 Kd 0.8 0.8 0.8
 Ks 0.001376 0.001376 0.001376
 d 0
-map_Kd textures/Full_beard_black_diff.png
-map_D textures/Full_beard_black_diff.png
+map_Kd images/Full_beard_black_diff.png
+map_D images/Full_beard_black_diff.png
 
 newmtl lambert8sg_23Material
 Kd 0 0 0
 Ks 0.4602 0.4602 0.4602
 d 0
-map_Kd textures/Glasses2.png
-map_D textures/Glasses2.png
+map_Kd images/Glasses2.png
+map_D images/Glasses2.png
diff --git a/media/onefang_741.obj b/media/models/onefang_741.obj
index 20ef975..20ef975 100644
--- a/media/onefang_741.obj
+++ b/media/models/onefang_741.obj
diff --git a/media/sonic.md2 b/media/models/sonic.md2
index 228edb9..228edb9 100644
--- a/media/sonic.md2
+++ b/media/models/sonic.md2
diff --git a/media/sweet_home.obj b/media/models/sweet_home.obj
index 1a52b93..1a52b93 100644
--- a/media/sweet_home.obj
+++ b/media/models/sweet_home.obj
diff --git a/media/normal_lego.png b/media/normal_lego.png
deleted file mode 100644
index 6a74ad9..0000000
--- a/media/normal_lego.png
+++ /dev/null
diff --git a/media/wood_01.jpg b/media/wood_01.jpg
deleted file mode 100644
index 89f1006..0000000
--- a/media/wood_01.jpg
+++ /dev/null
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index a7bb4de..caa4db7 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -249,7 +249,7 @@ winFang *woMan_add(globals *ourGlobals)
     evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(nf);
 
-    sprintf(buf, "%s/%s", prefix_data_get(), img3);
+    sprintf(buf, "%s/images/%s", prefix_data_get(), img3);
     tab = viewerList;                           tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NoIcon, "Viewers", _promote, tab_it);
     // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away.
     tab = _content_image_new(me->win, strdup(buf));     tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NoIcon, "Landmarks", _promote, tab_it);
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index 4e4e51c..94eb1bd 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -229,9 +229,9 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
 
   // Sort out the background.
   if (result->parent)
-    snprintf(buf, sizeof(buf), "%s/sky_04.jpg", prefix_data_get());
+    snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", prefix_data_get());
   else
-    snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get());
+    snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", prefix_data_get());
   result->bg = eo_add(ELM_BG_CLASS, obj,
     evas_obj_size_hint_weight_set(eoid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
     efl_file_set(eoid, buf, NULL),
@@ -252,7 +252,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
 
   // Evil hacks for no icons, until toolbars get fixed.
   if (0 == NoIcon[0])
-    snprintf(NoIcon, sizeof(NoIcon), "%s/spacer.png", prefix_data_get());
+    snprintf(NoIcon, sizeof(NoIcon), "%s/images/spacer.png", prefix_data_get());
 /*  This aint doing shit.  B-(
   obj = elm_icon_add(obj);
   elm_icon_order_lookup_set(obj, ELM_ICON_LOOKUP_THEME_FDO);
@@ -286,7 +286,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
     evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result);
 
     // Create corner handles.
-    snprintf(buf, sizeof(buf), "%s/pt.png", prefix_data_get());
+    snprintf(buf, sizeof(buf), "%s/images/pt.png", prefix_data_get());
     for (i = 0; i < 4; i++)
     {
       int cx = result->x, cy = result->y;