diff --git a/objects/clutter/camp/barrel-bin.iob b/objects/clutter/bincluster1.iob
similarity index 100%
rename from objects/clutter/camp/barrel-bin.iob
rename to objects/clutter/bincluster1.iob
diff --git a/objects/clutter/bombs/bomb.iob b/objects/clutter/bomb1.iob
similarity index 100%
rename from objects/clutter/bombs/bomb.iob
rename to objects/clutter/bomb1.iob
diff --git a/objects/clutter/bones/Bone1.iob b/objects/clutter/bone1.iob
similarity index 100%
rename from objects/clutter/bones/Bone1.iob
rename to objects/clutter/bone1.iob
diff --git a/objects/clutter/bones/Bone2.iob b/objects/clutter/bone2.iob
similarity index 100%
rename from objects/clutter/bones/Bone2.iob
rename to objects/clutter/bone2.iob
diff --git a/objects/clutter/bones/Bone3.iob b/objects/clutter/bone3.iob
similarity index 100%
rename from objects/clutter/bones/Bone3.iob
rename to objects/clutter/bone3.iob
diff --git a/objects/clutter/bones/Bone4.iob b/objects/clutter/bone4.iob
similarity index 100%
rename from objects/clutter/bones/Bone4.iob
rename to objects/clutter/bone4.iob
diff --git a/objects/clutter/bones/Bone5.iob b/objects/clutter/bone5.iob
similarity index 100%
rename from objects/clutter/bones/Bone5.iob
rename to objects/clutter/bone5.iob
diff --git a/objects/clutter/bones/Bone6.iob b/objects/clutter/bone6.iob
similarity index 100%
rename from objects/clutter/bones/Bone6.iob
rename to objects/clutter/bone6.iob
diff --git a/objects/clutter/bones/Bone7.iob b/objects/clutter/bone7.iob
similarity index 100%
rename from objects/clutter/bones/Bone7.iob
rename to objects/clutter/bone7.iob
diff --git a/objects/clutter/bone-spire/BoneSpire1.iob b/objects/clutter/bonespire1.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire1.iob
rename to objects/clutter/bonespire1.iob
diff --git a/objects/clutter/bone-spire/BoneSpire18.iob b/objects/clutter/bonespire10.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire18.iob
rename to objects/clutter/bonespire10.iob
diff --git a/objects/clutter/bone-spire/BoneSpire19.iob b/objects/clutter/bonespire11.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire19.iob
rename to objects/clutter/bonespire11.iob
diff --git a/objects/clutter/bone-spire/BoneSpire2.iob b/objects/clutter/bonespire12.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire2.iob
rename to objects/clutter/bonespire12.iob
diff --git a/objects/clutter/bone-spire/BoneSpire20.iob b/objects/clutter/bonespire13.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire20.iob
rename to objects/clutter/bonespire13.iob
diff --git a/objects/clutter/bone-spire/BoneSpire3.iob b/objects/clutter/bonespire14.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire3.iob
rename to objects/clutter/bonespire14.iob
diff --git a/objects/clutter/bone-spire/BoneSpire4.iob b/objects/clutter/bonespire15.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire4.iob
rename to objects/clutter/bonespire15.iob
diff --git a/objects/clutter/bone-spire/BoneSpire5.iob b/objects/clutter/bonespire16.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire5.iob
rename to objects/clutter/bonespire16.iob
diff --git a/objects/clutter/bone-spire/BoneSpire6.iob b/objects/clutter/bonespire17.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire6.iob
rename to objects/clutter/bonespire17.iob
diff --git a/objects/clutter/bone-spire/BoneSpire7.iob b/objects/clutter/bonespire18.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire7.iob
rename to objects/clutter/bonespire18.iob
diff --git a/objects/clutter/bone-spire/BoneSpire8.iob b/objects/clutter/bonespire19.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire8.iob
rename to objects/clutter/bonespire19.iob
diff --git a/objects/clutter/bone-spire/BoneSpire10.iob b/objects/clutter/bonespire2.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire10.iob
rename to objects/clutter/bonespire2.iob
diff --git a/objects/clutter/bone-spire/BoneSpire9.iob b/objects/clutter/bonespire20.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire9.iob
rename to objects/clutter/bonespire20.iob
diff --git a/objects/clutter/bone-spire/BoneSpire11.iob b/objects/clutter/bonespire3.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire11.iob
rename to objects/clutter/bonespire3.iob
diff --git a/objects/clutter/bone-spire/BoneSpire12.iob b/objects/clutter/bonespire4.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire12.iob
rename to objects/clutter/bonespire4.iob
diff --git a/objects/clutter/bone-spire/BoneSpire13.iob b/objects/clutter/bonespire5.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire13.iob
rename to objects/clutter/bonespire5.iob
diff --git a/objects/clutter/bone-spire/BoneSpire14.iob b/objects/clutter/bonespire6.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire14.iob
rename to objects/clutter/bonespire6.iob
diff --git a/objects/clutter/bone-spire/BoneSpire15.iob b/objects/clutter/bonespire7.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire15.iob
rename to objects/clutter/bonespire7.iob
diff --git a/objects/clutter/bone-spire/BoneSpire16.iob b/objects/clutter/bonespire8.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire16.iob
rename to objects/clutter/bonespire8.iob
diff --git a/objects/clutter/bone-spire/BoneSpire17.iob b/objects/clutter/bonespire9.iob
similarity index 100%
rename from objects/clutter/bone-spire/BoneSpire17.iob
rename to objects/clutter/bonespire9.iob
diff --git a/objects/clutter/boulder/boulder1.iob b/objects/clutter/boulder1.iob
similarity index 100%
rename from objects/clutter/boulder/boulder1.iob
rename to objects/clutter/boulder1.iob
diff --git a/objects/clutter/boulder/boulder10.iob b/objects/clutter/boulder10.iob
similarity index 100%
rename from objects/clutter/boulder/boulder10.iob
rename to objects/clutter/boulder10.iob
diff --git a/objects/clutter/boulder/boulder11.iob b/objects/clutter/boulder11.iob
similarity index 100%
rename from objects/clutter/boulder/boulder11.iob
rename to objects/clutter/boulder11.iob
diff --git a/objects/clutter/boulder/boulder12.iob b/objects/clutter/boulder12.iob
similarity index 100%
rename from objects/clutter/boulder/boulder12.iob
rename to objects/clutter/boulder12.iob
diff --git a/objects/clutter/boulder/boulder13.iob b/objects/clutter/boulder13.iob
similarity index 100%
rename from objects/clutter/boulder/boulder13.iob
rename to objects/clutter/boulder13.iob
diff --git a/objects/clutter/boulder/boulder14.iob b/objects/clutter/boulder14.iob
similarity index 100%
rename from objects/clutter/boulder/boulder14.iob
rename to objects/clutter/boulder14.iob
diff --git a/objects/clutter/boulder/boulder15.iob b/objects/clutter/boulder15.iob
similarity index 100%
rename from objects/clutter/boulder/boulder15.iob
rename to objects/clutter/boulder15.iob
diff --git a/objects/clutter/boulder/boulder2.iob b/objects/clutter/boulder2.iob
similarity index 100%
rename from objects/clutter/boulder/boulder2.iob
rename to objects/clutter/boulder2.iob
diff --git a/objects/clutter/boulder/boulder3.iob b/objects/clutter/boulder3.iob
similarity index 100%
rename from objects/clutter/boulder/boulder3.iob
rename to objects/clutter/boulder3.iob
diff --git a/objects/clutter/boulder/boulder4.iob b/objects/clutter/boulder4.iob
similarity index 100%
rename from objects/clutter/boulder/boulder4.iob
rename to objects/clutter/boulder4.iob
diff --git a/objects/clutter/boulder/boulder5.iob b/objects/clutter/boulder5.iob
similarity index 100%
rename from objects/clutter/boulder/boulder5.iob
rename to objects/clutter/boulder5.iob
diff --git a/objects/clutter/boulder/boulder6.iob b/objects/clutter/boulder6.iob
similarity index 100%
rename from objects/clutter/boulder/boulder6.iob
rename to objects/clutter/boulder6.iob
diff --git a/objects/clutter/boulder/boulder7.iob b/objects/clutter/boulder7.iob
similarity index 100%
rename from objects/clutter/boulder/boulder7.iob
rename to objects/clutter/boulder7.iob
diff --git a/objects/clutter/boulder/boulder8.iob b/objects/clutter/boulder8.iob
similarity index 100%
rename from objects/clutter/boulder/boulder8.iob
rename to objects/clutter/boulder8.iob
diff --git a/objects/clutter/boulder/boulder9.iob b/objects/clutter/boulder9.iob
similarity index 100%
rename from objects/clutter/boulder/boulder9.iob
rename to objects/clutter/boulder9.iob
diff --git a/objects/clutter/clutter/birch-clutt-1.iob b/objects/clutter/brichclutt1.iob
similarity index 100%
rename from objects/clutter/clutter/birch-clutt-1.iob
rename to objects/clutter/brichclutt1.iob
diff --git a/objects/clutter/clutter/birch-clutt-2.iob b/objects/clutter/brichclutt2.iob
similarity index 100%
rename from objects/clutter/clutter/birch-clutt-2.iob
rename to objects/clutter/brichclutt2.iob
diff --git a/objects/clutter/clutter/birch-clutt-3.iob b/objects/clutter/brichclutt3.iob
similarity index 100%
rename from objects/clutter/clutter/birch-clutt-3.iob
rename to objects/clutter/brichclutt3.iob
diff --git a/objects/clutter/clutter/birch-clutt-4.iob b/objects/clutter/brichclutt4.iob
similarity index 100%
rename from objects/clutter/clutter/birch-clutt-4.iob
rename to objects/clutter/brichclutt4.iob
diff --git a/objects/clutter/clutter/birch-clutt-5.iob b/objects/clutter/brichclutt5.iob
similarity index 100%
rename from objects/clutter/clutter/birch-clutt-5.iob
rename to objects/clutter/brichclutt5.iob
diff --git a/objects/clutter/global-clutter/BrokSphinxToomb-1.iob b/objects/clutter/brksphinx1.iob
similarity index 100%
rename from objects/clutter/global-clutter/BrokSphinxToomb-1.iob
rename to objects/clutter/brksphinx1.iob
diff --git a/objects/clutter/cactus-white/c1.iob b/objects/clutter/cactus-white/c1.iob
deleted file mode 100644
index 7586f1e7..00000000
Binary files a/objects/clutter/cactus-white/c1.iob and /dev/null differ
diff --git a/objects/clutter/cactus-white/c2.iob b/objects/clutter/cactus-white/c2.iob
deleted file mode 100644
index 0797b52d..00000000
Binary files a/objects/clutter/cactus-white/c2.iob and /dev/null differ
diff --git a/objects/clutter/cactus-white/c3.iob b/objects/clutter/cactus-white/c3.iob
deleted file mode 100644
index 795f9eb3..00000000
Binary files a/objects/clutter/cactus-white/c3.iob and /dev/null differ
diff --git a/objects/clutter/cactus-white/c4.iob b/objects/clutter/cactus-white/c4.iob
deleted file mode 100644
index eb67dc36..00000000
Binary files a/objects/clutter/cactus-white/c4.iob and /dev/null differ
diff --git a/objects/clutter/camp/camp.iob b/objects/clutter/camp1.iob
similarity index 100%
rename from objects/clutter/camp/camp.iob
rename to objects/clutter/camp1.iob
diff --git a/objects/clutter/camp/camp2.iob b/objects/clutter/camp2.iob
similarity index 100%
rename from objects/clutter/camp/camp2.iob
rename to objects/clutter/camp2.iob
diff --git a/objects/clutter/camp/camp3.iob b/objects/clutter/camp3.iob
similarity index 100%
rename from objects/clutter/camp/camp3.iob
rename to objects/clutter/camp3.iob
diff --git a/objects/clutter/camp/camp4.iob b/objects/clutter/camp4.iob
similarity index 100%
rename from objects/clutter/camp/camp4.iob
rename to objects/clutter/camp4.iob
diff --git a/objects/clutter/camp/camp5.iob b/objects/clutter/camp5.iob
similarity index 100%
rename from objects/clutter/camp/camp5.iob
rename to objects/clutter/camp5.iob
diff --git a/objects/clutter/lith/concrete-lith-1.iob b/objects/clutter/concretelith1.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-1.iob
rename to objects/clutter/concretelith1.iob
diff --git a/objects/clutter/lith/concrete-lith-2.iob b/objects/clutter/concretelith2.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-2.iob
rename to objects/clutter/concretelith2.iob
diff --git a/objects/clutter/lith/concrete-lith-3.iob b/objects/clutter/concretelith3.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-3.iob
rename to objects/clutter/concretelith3.iob
diff --git a/objects/clutter/lith/concrete-lith-4.iob b/objects/clutter/concretelith4.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-4.iob
rename to objects/clutter/concretelith4.iob
diff --git a/objects/clutter/lith/concrete-lith-5.iob b/objects/clutter/concretelith5.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-5.iob
rename to objects/clutter/concretelith5.iob
diff --git a/objects/clutter/lith/concrete-lith-6.iob b/objects/clutter/concretelith6.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-6.iob
rename to objects/clutter/concretelith6.iob
diff --git a/objects/clutter/lith/concrete-lith-7.iob b/objects/clutter/concretelith7.iob
similarity index 100%
rename from objects/clutter/lith/concrete-lith-7.iob
rename to objects/clutter/concretelith7.iob
diff --git a/objects/clutter/coral/coral-by-1.iob b/objects/clutter/coral/coral-by-1.iob
deleted file mode 100644
index 495c3cfd..00000000
Binary files a/objects/clutter/coral/coral-by-1.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-by-2.iob b/objects/clutter/coral/coral-by-2.iob
deleted file mode 100644
index 0f274322..00000000
Binary files a/objects/clutter/coral/coral-by-2.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-by-3.iob b/objects/clutter/coral/coral-by-3.iob
deleted file mode 100644
index dc8cadaa..00000000
Binary files a/objects/clutter/coral/coral-by-3.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-by-4.iob b/objects/clutter/coral/coral-by-4.iob
deleted file mode 100644
index 4acf3f21..00000000
Binary files a/objects/clutter/coral/coral-by-4.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-pink-1.iob b/objects/clutter/coral/coral-pink-1.iob
deleted file mode 100644
index df6e063e..00000000
Binary files a/objects/clutter/coral/coral-pink-1.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-pink-2.iob b/objects/clutter/coral/coral-pink-2.iob
deleted file mode 100644
index 874b0ef4..00000000
Binary files a/objects/clutter/coral/coral-pink-2.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-pink-3.iob b/objects/clutter/coral/coral-pink-3.iob
deleted file mode 100644
index a399611e..00000000
Binary files a/objects/clutter/coral/coral-pink-3.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-pink-4.iob b/objects/clutter/coral/coral-pink-4.iob
deleted file mode 100644
index dff0b836..00000000
Binary files a/objects/clutter/coral/coral-pink-4.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-purp-1.iob b/objects/clutter/coral/coral-purp-1.iob
deleted file mode 100644
index 33aab052..00000000
Binary files a/objects/clutter/coral/coral-purp-1.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-purp-2.iob b/objects/clutter/coral/coral-purp-2.iob
deleted file mode 100644
index 0ad5b120..00000000
Binary files a/objects/clutter/coral/coral-purp-2.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-purp-3.iob b/objects/clutter/coral/coral-purp-3.iob
deleted file mode 100644
index 06f3e491..00000000
Binary files a/objects/clutter/coral/coral-purp-3.iob and /dev/null differ
diff --git a/objects/clutter/coral/coral-red-1.iob b/objects/clutter/coral/coral-red-1.iob
deleted file mode 100644
index a8afab3a..00000000
Binary files a/objects/clutter/coral/coral-red-1.iob and /dev/null differ
diff --git a/objects/clutter/coral-rgb/coral-by-1.iob b/objects/clutter/coralby1.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-by-1.iob
rename to objects/clutter/coralby1.iob
diff --git a/objects/clutter/coral-rgb/coral-by-2.iob b/objects/clutter/coralby2.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-by-2.iob
rename to objects/clutter/coralby2.iob
diff --git a/objects/clutter/coral-rgb/coral-by-3.iob b/objects/clutter/coralby3.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-by-3.iob
rename to objects/clutter/coralby3.iob
diff --git a/objects/clutter/coral-rgb/coral-by-4.iob b/objects/clutter/coralby4.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-by-4.iob
rename to objects/clutter/coralby4.iob
diff --git a/objects/clutter/coral-rgb/coral-pink-1.iob b/objects/clutter/coralpink1.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-pink-1.iob
rename to objects/clutter/coralpink1.iob
diff --git a/objects/clutter/coral-rgb/coral-pink-2.iob b/objects/clutter/coralpink2.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-pink-2.iob
rename to objects/clutter/coralpink2.iob
diff --git a/objects/clutter/coral-rgb/coral-pink-3.iob b/objects/clutter/coralpink3.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-pink-3.iob
rename to objects/clutter/coralpink3.iob
diff --git a/objects/clutter/coral-rgb/coral-pink-4.iob b/objects/clutter/coralpink4.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-pink-4.iob
rename to objects/clutter/coralpink4.iob
diff --git a/objects/clutter/coral-rgb/coral-purp-1.iob b/objects/clutter/coralpurp1.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-purp-1.iob
rename to objects/clutter/coralpurp1.iob
diff --git a/objects/clutter/coral-rgb/coral-purp-2.iob b/objects/clutter/coralpurp2.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-purp-2.iob
rename to objects/clutter/coralpurp2.iob
diff --git a/objects/clutter/coral-rgb/coral-purp-3.iob b/objects/clutter/coralpurp3.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-purp-3.iob
rename to objects/clutter/coralpurp3.iob
diff --git a/objects/clutter/coral-rgb/coral-red-1.iob b/objects/clutter/coralred1.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-red-1.iob
rename to objects/clutter/coralred1.iob
diff --git a/objects/clutter/coral-rgb/coral-yellow-3.iob b/objects/clutter/coralyellow3.iob
similarity index 100%
rename from objects/clutter/coral-rgb/coral-yellow-3.iob
rename to objects/clutter/coralyellow3.iob
diff --git a/objects/clutter/clutter/desert-post1.iob b/objects/clutter/desertpost1.iob
similarity index 100%
rename from objects/clutter/clutter/desert-post1.iob
rename to objects/clutter/desertpost1.iob
diff --git a/objects/clutter/clutter/desert-post2.iob b/objects/clutter/desertpost2.iob
similarity index 100%
rename from objects/clutter/clutter/desert-post2.iob
rename to objects/clutter/desertpost2.iob
diff --git a/objects/clutter/clutter/desert-post3.iob b/objects/clutter/desertpost3.iob
similarity index 100%
rename from objects/clutter/clutter/desert-post3.iob
rename to objects/clutter/desertpost3.iob
diff --git a/objects/clutter/clutter/doak-spec-1.iob b/objects/clutter/doakspec1.iob
similarity index 100%
rename from objects/clutter/clutter/doak-spec-1.iob
rename to objects/clutter/doakspec1.iob
diff --git a/objects/clutter/clutter/doak-spec-2.iob b/objects/clutter/doakspec2.iob
similarity index 100%
rename from objects/clutter/clutter/doak-spec-2.iob
rename to objects/clutter/doakspec2.iob
diff --git a/objects/clutter/clutter/doak-spec-3.iob b/objects/clutter/doakspec3.iob
similarity index 100%
rename from objects/clutter/clutter/doak-spec-3.iob
rename to objects/clutter/doakspec3.iob
diff --git a/objects/clutter/stump/grave-1.iob b/objects/clutter/genericgrave1.iob
similarity index 100%
rename from objects/clutter/stump/grave-1.iob
rename to objects/clutter/genericgrave1.iob
diff --git a/objects/clutter/peaks/p1.iob b/objects/clutter/genericpeak1.iob
similarity index 100%
rename from objects/clutter/peaks/p1.iob
rename to objects/clutter/genericpeak1.iob
diff --git a/objects/clutter/peaks/p2.iob b/objects/clutter/genericpeak2.iob
similarity index 100%
rename from objects/clutter/peaks/p2.iob
rename to objects/clutter/genericpeak2.iob
diff --git a/objects/clutter/peaks/p3.iob b/objects/clutter/genericpeak3.iob
similarity index 100%
rename from objects/clutter/peaks/p3.iob
rename to objects/clutter/genericpeak3.iob
diff --git a/objects/clutter/peaks/p4.iob b/objects/clutter/genericpeak4.iob
similarity index 100%
rename from objects/clutter/peaks/p4.iob
rename to objects/clutter/genericpeak4.iob
diff --git a/objects/clutter/peaks/p5.iob b/objects/clutter/genericpeak5.iob
similarity index 100%
rename from objects/clutter/peaks/p5.iob
rename to objects/clutter/genericpeak5.iob
diff --git a/objects/clutter/peaks/p6.iob b/objects/clutter/genericpeak6.iob
similarity index 100%
rename from objects/clutter/peaks/p6.iob
rename to objects/clutter/genericpeak6.iob
diff --git a/objects/clutter/grave/grave.iob b/objects/clutter/grave1.iob
similarity index 100%
rename from objects/clutter/grave/grave.iob
rename to objects/clutter/grave1.iob
diff --git a/objects/clutter/patch/graveldirt1.iob b/objects/clutter/gravelsplotch1.iob
similarity index 100%
rename from objects/clutter/patch/graveldirt1.iob
rename to objects/clutter/gravelsplotch1.iob
diff --git a/objects/clutter/patch/graveldirt2.iob b/objects/clutter/gravelsplotch2.iob
similarity index 100%
rename from objects/clutter/patch/graveldirt2.iob
rename to objects/clutter/gravelsplotch2.iob
diff --git a/objects/clutter/patch/graveldirt3.iob b/objects/clutter/gravelsplotch3.iob
similarity index 100%
rename from objects/clutter/patch/graveldirt3.iob
rename to objects/clutter/gravelsplotch3.iob
diff --git a/objects/clutter/patch/graveldirt4.iob b/objects/clutter/gravelsplotch4.iob
similarity index 100%
rename from objects/clutter/patch/graveldirt4.iob
rename to objects/clutter/gravelsplotch4.iob
diff --git a/objects/clutter/haybale/hay1.iob b/objects/clutter/hay1.iob
similarity index 100%
rename from objects/clutter/haybale/hay1.iob
rename to objects/clutter/hay1.iob
diff --git a/objects/clutter/haybale/hay2.iob b/objects/clutter/hay2.iob
similarity index 100%
rename from objects/clutter/haybale/hay2.iob
rename to objects/clutter/hay2.iob
diff --git a/objects/clutter/haybale/hay3.iob b/objects/clutter/hay3.iob
similarity index 100%
rename from objects/clutter/haybale/hay3.iob
rename to objects/clutter/hay3.iob
diff --git a/objects/clutter/bee/hive.iob b/objects/clutter/hive.iob
similarity index 100%
rename from objects/clutter/bee/hive.iob
rename to objects/clutter/hive.iob
diff --git a/objects/clutter/bee/hive1.iob b/objects/clutter/hive2.iob
similarity index 100%
rename from objects/clutter/bee/hive1.iob
rename to objects/clutter/hive2.iob
diff --git a/objects/clutter/hive/honey-nest-1.iob b/objects/clutter/honeynest1.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-1.iob
rename to objects/clutter/honeynest1.iob
diff --git a/objects/clutter/hive/honey-nest-9.iob b/objects/clutter/honeynest10.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-9.iob
rename to objects/clutter/honeynest10.iob
diff --git a/objects/clutter/hive/honey-nest-10.iob b/objects/clutter/honeynest2.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-10.iob
rename to objects/clutter/honeynest2.iob
diff --git a/objects/clutter/hive/honey-nest-2.iob b/objects/clutter/honeynest3.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-2.iob
rename to objects/clutter/honeynest3.iob
diff --git a/objects/clutter/hive/honey-nest-3.iob b/objects/clutter/honeynest4.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-3.iob
rename to objects/clutter/honeynest4.iob
diff --git a/objects/clutter/hive/honey-nest-4.iob b/objects/clutter/honeynest5.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-4.iob
rename to objects/clutter/honeynest5.iob
diff --git a/objects/clutter/hive/honey-nest-5.iob b/objects/clutter/honeynest6.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-5.iob
rename to objects/clutter/honeynest6.iob
diff --git a/objects/clutter/hive/honey-nest-6.iob b/objects/clutter/honeynest7.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-6.iob
rename to objects/clutter/honeynest7.iob
diff --git a/objects/clutter/hive/honey-nest-7.iob b/objects/clutter/honeynest8.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-7.iob
rename to objects/clutter/honeynest8.iob
diff --git a/objects/clutter/hive/honey-nest-8.iob b/objects/clutter/honeynest9.iob
similarity index 100%
rename from objects/clutter/hive/honey-nest-8.iob
rename to objects/clutter/honeynest9.iob
diff --git a/objects/clutter/ice/ICEMush1.ish b/objects/clutter/ice/ICEMush1.ish
deleted file mode 100644
index ec01a7fe..00000000
Binary files a/objects/clutter/ice/ICEMush1.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush2.ish b/objects/clutter/ice/ICEMush2.ish
deleted file mode 100644
index 3a9f6308..00000000
Binary files a/objects/clutter/ice/ICEMush2.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush3.ish b/objects/clutter/ice/ICEMush3.ish
deleted file mode 100644
index b4f98302..00000000
Binary files a/objects/clutter/ice/ICEMush3.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush4.ish b/objects/clutter/ice/ICEMush4.ish
deleted file mode 100644
index 4f8e0c34..00000000
Binary files a/objects/clutter/ice/ICEMush4.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush5.ish b/objects/clutter/ice/ICEMush5.ish
deleted file mode 100644
index a24d25e1..00000000
Binary files a/objects/clutter/ice/ICEMush5.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush6.ish b/objects/clutter/ice/ICEMush6.ish
deleted file mode 100644
index 9c79f868..00000000
Binary files a/objects/clutter/ice/ICEMush6.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush7.ish b/objects/clutter/ice/ICEMush7.ish
deleted file mode 100644
index 5422bebc..00000000
Binary files a/objects/clutter/ice/ICEMush7.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush8.ish b/objects/clutter/ice/ICEMush8.ish
deleted file mode 100644
index 3d9f239a..00000000
Binary files a/objects/clutter/ice/ICEMush8.ish and /dev/null differ
diff --git a/objects/clutter/ice/ICEMush9.ish b/objects/clutter/ice/ICEMush9.ish
deleted file mode 100644
index d7fc07d1..00000000
Binary files a/objects/clutter/ice/ICEMush9.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire1.ish b/objects/clutter/ice/IceSpire1.ish
deleted file mode 100644
index da62a698..00000000
Binary files a/objects/clutter/ice/IceSpire1.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire2.ish b/objects/clutter/ice/IceSpire2.ish
deleted file mode 100644
index 2edc76be..00000000
Binary files a/objects/clutter/ice/IceSpire2.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire3.ish b/objects/clutter/ice/IceSpire3.ish
deleted file mode 100644
index 441b65ff..00000000
Binary files a/objects/clutter/ice/IceSpire3.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire4.ish b/objects/clutter/ice/IceSpire4.ish
deleted file mode 100644
index 655a4f2e..00000000
Binary files a/objects/clutter/ice/IceSpire4.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire5.ish b/objects/clutter/ice/IceSpire5.ish
deleted file mode 100644
index 6679c2b6..00000000
Binary files a/objects/clutter/ice/IceSpire5.ish and /dev/null differ
diff --git a/objects/clutter/ice/IceSpire6.ish b/objects/clutter/ice/IceSpire6.ish
deleted file mode 100644
index 2ac3cfc4..00000000
Binary files a/objects/clutter/ice/IceSpire6.ish and /dev/null differ
diff --git a/objects/clutter/ice/wonder-1.iob b/objects/clutter/ice/wonder-1.iob
deleted file mode 100644
index e7aee1d9..00000000
Binary files a/objects/clutter/ice/wonder-1.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-10.iob b/objects/clutter/ice/wonder-10.iob
deleted file mode 100644
index d92d58a1..00000000
Binary files a/objects/clutter/ice/wonder-10.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-2.iob b/objects/clutter/ice/wonder-2.iob
deleted file mode 100644
index 3317c878..00000000
Binary files a/objects/clutter/ice/wonder-2.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-3.iob b/objects/clutter/ice/wonder-3.iob
deleted file mode 100644
index 6b21ccc5..00000000
Binary files a/objects/clutter/ice/wonder-3.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-4.iob b/objects/clutter/ice/wonder-4.iob
deleted file mode 100644
index 5d31f0b5..00000000
Binary files a/objects/clutter/ice/wonder-4.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-5.iob b/objects/clutter/ice/wonder-5.iob
deleted file mode 100644
index 31d62b35..00000000
Binary files a/objects/clutter/ice/wonder-5.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-6.iob b/objects/clutter/ice/wonder-6.iob
deleted file mode 100644
index ceb1b31f..00000000
Binary files a/objects/clutter/ice/wonder-6.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-7.iob b/objects/clutter/ice/wonder-7.iob
deleted file mode 100644
index 8a23290a..00000000
Binary files a/objects/clutter/ice/wonder-7.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-8.iob b/objects/clutter/ice/wonder-8.iob
deleted file mode 100644
index e2131382..00000000
Binary files a/objects/clutter/ice/wonder-8.iob and /dev/null differ
diff --git a/objects/clutter/ice/wonder-9.iob b/objects/clutter/ice/wonder-9.iob
deleted file mode 100644
index 7306d767..00000000
Binary files a/objects/clutter/ice/wonder-9.iob and /dev/null differ
diff --git a/objects/clutter/ice-spikes/ic-1.iob b/objects/clutter/icecluster1.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-1.iob
rename to objects/clutter/icecluster1.iob
diff --git a/objects/clutter/ice-spikes/ic-8.iob b/objects/clutter/icecluster10.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-8.iob
rename to objects/clutter/icecluster10.iob
diff --git a/objects/clutter/ice-spikes/ic-9.iob b/objects/clutter/icecluster11.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-9.iob
rename to objects/clutter/icecluster11.iob
diff --git a/objects/clutter/ice-spikes/ic-10.iob b/objects/clutter/icecluster2.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-10.iob
rename to objects/clutter/icecluster2.iob
diff --git a/objects/clutter/ice-spikes/ic-11.iob b/objects/clutter/icecluster3.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-11.iob
rename to objects/clutter/icecluster3.iob
diff --git a/objects/clutter/ice-spikes/ic-2.iob b/objects/clutter/icecluster4.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-2.iob
rename to objects/clutter/icecluster4.iob
diff --git a/objects/clutter/ice-spikes/ic-3.iob b/objects/clutter/icecluster5.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-3.iob
rename to objects/clutter/icecluster5.iob
diff --git a/objects/clutter/ice-spikes/ic-4.iob b/objects/clutter/icecluster6.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-4.iob
rename to objects/clutter/icecluster6.iob
diff --git a/objects/clutter/ice-spikes/ic-5.iob b/objects/clutter/icecluster7.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-5.iob
rename to objects/clutter/icecluster7.iob
diff --git a/objects/clutter/ice-spikes/ic-6.iob b/objects/clutter/icecluster8.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-6.iob
rename to objects/clutter/icecluster8.iob
diff --git a/objects/clutter/ice-spikes/ic-7.iob b/objects/clutter/icecluster9.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ic-7.iob
rename to objects/clutter/icecluster9.iob
diff --git a/objects/clutter/ice-spikes/ice-spec-1.iob b/objects/clutter/icespec1.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ice-spec-1.iob
rename to objects/clutter/icespec1.iob
diff --git a/objects/clutter/ice-spikes/ice-spec-2.iob b/objects/clutter/icespec2.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ice-spec-2.iob
rename to objects/clutter/icespec2.iob
diff --git a/objects/clutter/ice-spikes/ice-spec-3.iob b/objects/clutter/icespec3.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ice-spec-3.iob
rename to objects/clutter/icespec3.iob
diff --git a/objects/clutter/ice-spikes/ice-spec-4.iob b/objects/clutter/icespec4.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ice-spec-4.iob
rename to objects/clutter/icespec4.iob
diff --git a/objects/clutter/ice-spikes/ice-spec-5.iob b/objects/clutter/icespec5.iob
similarity index 100%
rename from objects/clutter/ice-spikes/ice-spec-5.iob
rename to objects/clutter/icespec5.iob
diff --git a/objects/clutter/spire-ice-medium/IceSpire4.iob b/objects/clutter/icespiremed1.iob
similarity index 100%
rename from objects/clutter/spire-ice-medium/IceSpire4.iob
rename to objects/clutter/icespiremed1.iob
diff --git a/objects/clutter/spire-ice-medium/IceSpire5.iob b/objects/clutter/icespiremed2.iob
similarity index 100%
rename from objects/clutter/spire-ice-medium/IceSpire5.iob
rename to objects/clutter/icespiremed2.iob
diff --git a/objects/clutter/spire-ice-medium/IceSpire6.iob b/objects/clutter/icespiremed3.iob
similarity index 100%
rename from objects/clutter/spire-ice-medium/IceSpire6.iob
rename to objects/clutter/icespiremed3.iob
diff --git a/objects/clutter/spire-ice-small/IceSpire1.iob b/objects/clutter/icespiresmol1.iob
similarity index 100%
rename from objects/clutter/spire-ice-small/IceSpire1.iob
rename to objects/clutter/icespiresmol1.iob
diff --git a/objects/clutter/spire-ice-small/IceSpire2.iob b/objects/clutter/icespiresmol2.iob
similarity index 100%
rename from objects/clutter/spire-ice-small/IceSpire2.iob
rename to objects/clutter/icespiresmol2.iob
diff --git a/objects/clutter/spire-ice-small/IceSpire3.iob b/objects/clutter/icespiresmol3.iob
similarity index 100%
rename from objects/clutter/spire-ice-small/IceSpire3.iob
rename to objects/clutter/icespiresmol3.iob
diff --git a/objects/clutter/clutter/JClutter1.iob b/objects/clutter/jungleclutt1.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter1.iob
rename to objects/clutter/jungleclutt1.iob
diff --git a/objects/clutter/clutter/JClutter6.iob b/objects/clutter/jungleclutt10.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter6.iob
rename to objects/clutter/jungleclutt10.iob
diff --git a/objects/clutter/clutter/JClutter7.iob b/objects/clutter/jungleclutt11.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter7.iob
rename to objects/clutter/jungleclutt11.iob
diff --git a/objects/clutter/clutter/JClutter8.iob b/objects/clutter/jungleclutt12.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter8.iob
rename to objects/clutter/jungleclutt12.iob
diff --git a/objects/clutter/clutter/JClutter9.iob b/objects/clutter/jungleclutt13.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter9.iob
rename to objects/clutter/jungleclutt13.iob
diff --git a/objects/clutter/clutter/JClutter10.iob b/objects/clutter/jungleclutt2.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter10.iob
rename to objects/clutter/jungleclutt2.iob
diff --git a/objects/clutter/clutter/JClutter11.iob b/objects/clutter/jungleclutt3.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter11.iob
rename to objects/clutter/jungleclutt3.iob
diff --git a/objects/clutter/clutter/JClutter12.iob b/objects/clutter/jungleclutt4.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter12.iob
rename to objects/clutter/jungleclutt4.iob
diff --git a/objects/clutter/clutter/JClutter13.iob b/objects/clutter/jungleclutt5.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter13.iob
rename to objects/clutter/jungleclutt5.iob
diff --git a/objects/clutter/clutter/JClutter2.iob b/objects/clutter/jungleclutt6.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter2.iob
rename to objects/clutter/jungleclutt6.iob
diff --git a/objects/clutter/clutter/JClutter3.iob b/objects/clutter/jungleclutt7.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter3.iob
rename to objects/clutter/jungleclutt7.iob
diff --git a/objects/clutter/clutter/JClutter4.iob b/objects/clutter/jungleclutt8.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter4.iob
rename to objects/clutter/jungleclutt8.iob
diff --git a/objects/clutter/clutter/JClutter5.iob b/objects/clutter/jungleclutt9.iob
similarity index 100%
rename from objects/clutter/clutter/JClutter5.iob
rename to objects/clutter/jungleclutt9.iob
diff --git a/objects/clutter/clutter/Jstone1.iob b/objects/clutter/junglestone1.iob
similarity index 100%
rename from objects/clutter/clutter/Jstone1.iob
rename to objects/clutter/junglestone1.iob
diff --git a/objects/clutter/clutter/Jstone2.iob b/objects/clutter/junglestone2.iob
similarity index 100%
rename from objects/clutter/clutter/Jstone2.iob
rename to objects/clutter/junglestone2.iob
diff --git a/objects/clutter/garbage/clutter-1.iob b/objects/clutter/literalgarbage1.iob
similarity index 100%
rename from objects/clutter/garbage/clutter-1.iob
rename to objects/clutter/literalgarbage1.iob
diff --git a/objects/clutter/garbage/clutter-2.iob b/objects/clutter/literalgarbage2.iob
similarity index 100%
rename from objects/clutter/garbage/clutter-2.iob
rename to objects/clutter/literalgarbage2.iob
diff --git a/objects/clutter/garbage/clutter-3.iob b/objects/clutter/literalgarbage3.iob
similarity index 100%
rename from objects/clutter/garbage/clutter-3.iob
rename to objects/clutter/literalgarbage3.iob
diff --git a/objects/clutter/garbage/clutter-4.iob b/objects/clutter/literalgarbage4.iob
similarity index 100%
rename from objects/clutter/garbage/clutter-4.iob
rename to objects/clutter/literalgarbage4.iob
diff --git a/objects/clutter/spire-magma/MagmaSpire1.iob b/objects/clutter/magmaspire1.iob
similarity index 100%
rename from objects/clutter/spire-magma/MagmaSpire1.iob
rename to objects/clutter/magmaspire1.iob
diff --git a/objects/clutter/spire-magma/MagmaSpire2.iob b/objects/clutter/magmaspire2.iob
similarity index 100%
rename from objects/clutter/spire-magma/MagmaSpire2.iob
rename to objects/clutter/magmaspire2.iob
diff --git a/objects/clutter/spire-magma/MagmaSpire3.iob b/objects/clutter/magmaspire3.iob
similarity index 100%
rename from objects/clutter/spire-magma/MagmaSpire3.iob
rename to objects/clutter/magmaspire3.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb1.iob b/objects/clutter/medtourmaclutt1.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb1.iob
rename to objects/clutter/medtourmaclutt1.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb18.iob b/objects/clutter/medtourmaclutt10.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb18.iob
rename to objects/clutter/medtourmaclutt10.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb19.iob b/objects/clutter/medtourmaclutt11.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb19.iob
rename to objects/clutter/medtourmaclutt11.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb2.iob b/objects/clutter/medtourmaclutt12.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb2.iob
rename to objects/clutter/medtourmaclutt12.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb20.iob b/objects/clutter/medtourmaclutt13.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb20.iob
rename to objects/clutter/medtourmaclutt13.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb3.iob b/objects/clutter/medtourmaclutt14.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb3.iob
rename to objects/clutter/medtourmaclutt14.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb4.iob b/objects/clutter/medtourmaclutt15.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb4.iob
rename to objects/clutter/medtourmaclutt15.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb5.iob b/objects/clutter/medtourmaclutt16.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb5.iob
rename to objects/clutter/medtourmaclutt16.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb6.iob b/objects/clutter/medtourmaclutt17.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb6.iob
rename to objects/clutter/medtourmaclutt17.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb7.iob b/objects/clutter/medtourmaclutt18.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb7.iob
rename to objects/clutter/medtourmaclutt18.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb8.iob b/objects/clutter/medtourmaclutt19.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb8.iob
rename to objects/clutter/medtourmaclutt19.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb10.iob b/objects/clutter/medtourmaclutt2.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb10.iob
rename to objects/clutter/medtourmaclutt2.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb9.iob b/objects/clutter/medtourmaclutt20.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb9.iob
rename to objects/clutter/medtourmaclutt20.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb11.iob b/objects/clutter/medtourmaclutt3.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb11.iob
rename to objects/clutter/medtourmaclutt3.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb12.iob b/objects/clutter/medtourmaclutt4.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb12.iob
rename to objects/clutter/medtourmaclutt4.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb13.iob b/objects/clutter/medtourmaclutt5.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb13.iob
rename to objects/clutter/medtourmaclutt5.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb14.iob b/objects/clutter/medtourmaclutt6.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb14.iob
rename to objects/clutter/medtourmaclutt6.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb15.iob b/objects/clutter/medtourmaclutt7.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb15.iob
rename to objects/clutter/medtourmaclutt7.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb16.iob b/objects/clutter/medtourmaclutt8.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb16.iob
rename to objects/clutter/medtourmaclutt8.iob
diff --git a/objects/clutter/oakbush-tgarb/TGarb17.iob b/objects/clutter/medtourmaclutt9.iob
similarity index 100%
rename from objects/clutter/oakbush-tgarb/TGarb17.iob
rename to objects/clutter/medtourmaclutt9.iob
diff --git a/objects/clutter/clutter/subporta.iob b/objects/clutter/nportstone1.iob
similarity index 100%
rename from objects/clutter/clutter/subporta.iob
rename to objects/clutter/nportstone1.iob
diff --git a/objects/clutter/clutter/oak-clutt-1.iob b/objects/clutter/oakclutt1.iob
similarity index 100%
rename from objects/clutter/clutter/oak-clutt-1.iob
rename to objects/clutter/oakclutt1.iob
diff --git a/objects/clutter/clutter/oak-clutt-2.iob b/objects/clutter/oakclutt2.iob
similarity index 100%
rename from objects/clutter/clutter/oak-clutt-2.iob
rename to objects/clutter/oakclutt2.iob
diff --git a/objects/clutter/clutter/oak-clutt-3.iob b/objects/clutter/oakclutt3.iob
similarity index 100%
rename from objects/clutter/clutter/oak-clutt-3.iob
rename to objects/clutter/oakclutt3.iob
diff --git a/objects/clutter/clutter/oak-clutt-4.iob b/objects/clutter/oakclutt4.iob
similarity index 100%
rename from objects/clutter/clutter/oak-clutt-4.iob
rename to objects/clutter/oakclutt4.iob
diff --git a/objects/clutter/clutter/oak-clutt-5.iob b/objects/clutter/oakclutt5.iob
similarity index 100%
rename from objects/clutter/clutter/oak-clutt-5.iob
rename to objects/clutter/oakclutt5.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-1.iob b/objects/clutter/oakdenclutt1.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-1.iob
rename to objects/clutter/oakdenclutt1.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-9.iob b/objects/clutter/oakdenclutt10.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-9.iob
rename to objects/clutter/oakdenclutt10.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-10.iob b/objects/clutter/oakdenclutt2.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-10.iob
rename to objects/clutter/oakdenclutt2.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-2.iob b/objects/clutter/oakdenclutt3.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-2.iob
rename to objects/clutter/oakdenclutt3.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-3.iob b/objects/clutter/oakdenclutt4.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-3.iob
rename to objects/clutter/oakdenclutt4.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-4.iob b/objects/clutter/oakdenclutt5.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-4.iob
rename to objects/clutter/oakdenclutt5.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-5.iob b/objects/clutter/oakdenclutt6.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-5.iob
rename to objects/clutter/oakdenclutt6.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-6.iob b/objects/clutter/oakdenclutt7.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-6.iob
rename to objects/clutter/oakdenclutt7.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-7.iob b/objects/clutter/oakdenclutt8.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-7.iob
rename to objects/clutter/oakdenclutt8.iob
diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-8.iob b/objects/clutter/oakdenclutt9.iob
similarity index 100%
rename from objects/clutter/denmyre/oak-denmyre-clutter-8.iob
rename to objects/clutter/oakdenclutt9.iob
diff --git a/objects/clutter/oak-log/log1.iob b/objects/clutter/oaklog1.iob
similarity index 100%
rename from objects/clutter/oak-log/log1.iob
rename to objects/clutter/oaklog1.iob
diff --git a/objects/clutter/oak-log/log2.iob b/objects/clutter/oaklog2.iob
similarity index 100%
rename from objects/clutter/oak-log/log2.iob
rename to objects/clutter/oaklog2.iob
diff --git a/objects/clutter/oak-log/log3.iob b/objects/clutter/oaklog3.iob
similarity index 100%
rename from objects/clutter/oak-log/log3.iob
rename to objects/clutter/oaklog3.iob
diff --git a/objects/clutter/oak-bush/bush1.iob b/objects/clutter/oakshrub1.iob
similarity index 100%
rename from objects/clutter/oak-bush/bush1.iob
rename to objects/clutter/oakshrub1.iob
diff --git a/objects/clutter/oak-bush/bush2.iob b/objects/clutter/oakshrub2.iob
similarity index 100%
rename from objects/clutter/oak-bush/bush2.iob
rename to objects/clutter/oakshrub2.iob
diff --git a/objects/clutter/oak-bush/bush3.iob b/objects/clutter/oakshrub3.iob
similarity index 100%
rename from objects/clutter/oak-bush/bush3.iob
rename to objects/clutter/oakshrub3.iob
diff --git a/objects/clutter/oak-bush/bush4.iob b/objects/clutter/oakshrub4.iob
similarity index 100%
rename from objects/clutter/oak-bush/bush4.iob
rename to objects/clutter/oakshrub4.iob
diff --git a/objects/clutter/stone-clutt/obelisk-1.iob b/objects/clutter/obelisk1.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-1.iob
rename to objects/clutter/obelisk1.iob
diff --git a/objects/clutter/stone-clutt/obelisk-2.iob b/objects/clutter/obelisk2.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-2.iob
rename to objects/clutter/obelisk2.iob
diff --git a/objects/clutter/stone-clutt/obelisk-3.iob b/objects/clutter/obelisk3.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-3.iob
rename to objects/clutter/obelisk3.iob
diff --git a/objects/clutter/stone-clutt/obelisk-4.iob b/objects/clutter/obelisk4.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-4.iob
rename to objects/clutter/obelisk4.iob
diff --git a/objects/clutter/stone-clutt/obelisk-5.iob b/objects/clutter/obelisk5.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-5.iob
rename to objects/clutter/obelisk5.iob
diff --git a/objects/clutter/stone-clutt/obelisk-6.iob b/objects/clutter/obelisk6.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-6.iob
rename to objects/clutter/obelisk6.iob
diff --git a/objects/clutter/stone-clutt/obelisk-7.iob b/objects/clutter/obelisk7.iob
similarity index 100%
rename from objects/clutter/stone-clutt/obelisk-7.iob
rename to objects/clutter/obelisk7.iob
diff --git a/objects/clutter/rocks/r1.iob b/objects/clutter/rock1.iob
similarity index 100%
rename from objects/clutter/rocks/r1.iob
rename to objects/clutter/rock1.iob
diff --git a/objects/clutter/rocks/r2.iob b/objects/clutter/rock2.iob
similarity index 100%
rename from objects/clutter/rocks/r2.iob
rename to objects/clutter/rock2.iob
diff --git a/objects/clutter/rocks/r3.iob b/objects/clutter/rock3.iob
similarity index 100%
rename from objects/clutter/rocks/r3.iob
rename to objects/clutter/rock3.iob
diff --git a/objects/clutter/rocks/r4.iob b/objects/clutter/rock4.iob
similarity index 100%
rename from objects/clutter/rocks/r4.iob
rename to objects/clutter/rock4.iob
diff --git a/objects/clutter/redwood/bush-1.iob b/objects/clutter/rshrub1.iob
similarity index 100%
rename from objects/clutter/redwood/bush-1.iob
rename to objects/clutter/rshrub1.iob
diff --git a/objects/clutter/redwood/bush-2.iob b/objects/clutter/rshrub2.iob
similarity index 100%
rename from objects/clutter/redwood/bush-2.iob
rename to objects/clutter/rshrub2.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter1.iob b/objects/clutter/savclutt1.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter1.iob
rename to objects/clutter/savclutt1.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter2.iob b/objects/clutter/savclutt2.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter2.iob
rename to objects/clutter/savclutt2.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter3.iob b/objects/clutter/savclutt3.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter3.iob
rename to objects/clutter/savclutt3.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter4.iob b/objects/clutter/savclutt4.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter4.iob
rename to objects/clutter/savclutt4.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter5.iob b/objects/clutter/savclutt5.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter5.iob
rename to objects/clutter/savclutt5.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter6.iob b/objects/clutter/savclutt6.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter6.iob
rename to objects/clutter/savclutt6.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter7.iob b/objects/clutter/savclutt7.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter7.iob
rename to objects/clutter/savclutt7.iob
diff --git a/objects/clutter/savanna-clutter/SavanaClutter8.iob b/objects/clutter/savclutt8.iob
similarity index 100%
rename from objects/clutter/savanna-clutter/SavanaClutter8.iob
rename to objects/clutter/savclutt8.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock1.iob b/objects/clutter/savrock1.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock1.iob
rename to objects/clutter/savrock1.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock2.iob b/objects/clutter/savrock2.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock2.iob
rename to objects/clutter/savrock2.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock3.iob b/objects/clutter/savrock3.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock3.iob
rename to objects/clutter/savrock3.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock4.iob b/objects/clutter/savrock4.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock4.iob
rename to objects/clutter/savrock4.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock5.iob b/objects/clutter/savrock5.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock5.iob
rename to objects/clutter/savrock5.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock6.iob b/objects/clutter/savrock6.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock6.iob
rename to objects/clutter/savrock6.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock7.iob b/objects/clutter/savrock7.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock7.iob
rename to objects/clutter/savrock7.iob
diff --git a/objects/clutter/savanna-rock/SavanaRock8.iob b/objects/clutter/savrock8.iob
similarity index 100%
rename from objects/clutter/savanna-rock/SavanaRock8.iob
rename to objects/clutter/savrock8.iob
diff --git a/objects/clutter/bush/small/1.iob b/objects/clutter/sbush1.iob
similarity index 100%
rename from objects/clutter/bush/small/1.iob
rename to objects/clutter/sbush1.iob
diff --git a/objects/clutter/bush/small/2.iob b/objects/clutter/sbush2.iob
similarity index 100%
rename from objects/clutter/bush/small/2.iob
rename to objects/clutter/sbush2.iob
diff --git a/objects/clutter/bush/small/3.iob b/objects/clutter/sbush3.iob
similarity index 100%
rename from objects/clutter/bush/small/3.iob
rename to objects/clutter/sbush3.iob
diff --git a/objects/clutter/misc/shrub-1.iob b/objects/clutter/shrub1.iob
similarity index 100%
rename from objects/clutter/misc/shrub-1.iob
rename to objects/clutter/shrub1.iob
diff --git a/objects/clutter/misc/shrub-7.iob b/objects/clutter/shrub10.iob
similarity index 100%
rename from objects/clutter/misc/shrub-7.iob
rename to objects/clutter/shrub10.iob
diff --git a/objects/clutter/misc/shrub-8.iob b/objects/clutter/shrub11.iob
similarity index 100%
rename from objects/clutter/misc/shrub-8.iob
rename to objects/clutter/shrub11.iob
diff --git a/objects/clutter/misc/shrub-9.iob b/objects/clutter/shrub12.iob
similarity index 100%
rename from objects/clutter/misc/shrub-9.iob
rename to objects/clutter/shrub12.iob
diff --git a/objects/clutter/misc/shrub-10.iob b/objects/clutter/shrub2.iob
similarity index 100%
rename from objects/clutter/misc/shrub-10.iob
rename to objects/clutter/shrub2.iob
diff --git a/objects/clutter/misc/shrub-11.iob b/objects/clutter/shrub3.iob
similarity index 100%
rename from objects/clutter/misc/shrub-11.iob
rename to objects/clutter/shrub3.iob
diff --git a/objects/clutter/misc/shrub-13.iob b/objects/clutter/shrub4.iob
similarity index 100%
rename from objects/clutter/misc/shrub-13.iob
rename to objects/clutter/shrub4.iob
diff --git a/objects/clutter/misc/shrub-2.iob b/objects/clutter/shrub5.iob
similarity index 100%
rename from objects/clutter/misc/shrub-2.iob
rename to objects/clutter/shrub5.iob
diff --git a/objects/clutter/misc/shrub-3.iob b/objects/clutter/shrub6.iob
similarity index 100%
rename from objects/clutter/misc/shrub-3.iob
rename to objects/clutter/shrub6.iob
diff --git a/objects/clutter/misc/shrub-4.iob b/objects/clutter/shrub7.iob
similarity index 100%
rename from objects/clutter/misc/shrub-4.iob
rename to objects/clutter/shrub7.iob
diff --git a/objects/clutter/misc/shrub-5.iob b/objects/clutter/shrub8.iob
similarity index 100%
rename from objects/clutter/misc/shrub-5.iob
rename to objects/clutter/shrub8.iob
diff --git a/objects/clutter/misc/shrub-6.iob b/objects/clutter/shrub9.iob
similarity index 100%
rename from objects/clutter/misc/shrub-6.iob
rename to objects/clutter/shrub9.iob
diff --git a/objects/clutter/ice-spikes/sp-1.iob b/objects/clutter/singleicespike1.iob
similarity index 100%
rename from objects/clutter/ice-spikes/sp-1.iob
rename to objects/clutter/singleicespike1.iob
diff --git a/objects/clutter/ice-spikes/sp-2.iob b/objects/clutter/singleicespike2.iob
similarity index 100%
rename from objects/clutter/ice-spikes/sp-2.iob
rename to objects/clutter/singleicespike2.iob
diff --git a/objects/clutter/ice-spikes/sp-3.iob b/objects/clutter/singleicespike3.iob
similarity index 100%
rename from objects/clutter/ice-spikes/sp-3.iob
rename to objects/clutter/singleicespike3.iob
diff --git a/objects/clutter/ice-spikes/sp-4.iob b/objects/clutter/singleicespike4.iob
similarity index 100%
rename from objects/clutter/ice-spikes/sp-4.iob
rename to objects/clutter/singleicespike4.iob
diff --git a/objects/clutter/ice-spikes/sp-5.iob b/objects/clutter/singleicespike5.iob
similarity index 100%
rename from objects/clutter/ice-spikes/sp-5.iob
rename to objects/clutter/singleicespike5.iob
diff --git a/objects/clutter/skulls/giant-skull.iob b/objects/clutter/skull1.iob
similarity index 100%
rename from objects/clutter/skulls/giant-skull.iob
rename to objects/clutter/skull1.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-1.iob b/objects/clutter/smoleicespike1.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-1.iob
rename to objects/clutter/smoleicespike1.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-2.iob b/objects/clutter/smoleicespike2.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-2.iob
rename to objects/clutter/smoleicespike2.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-3.iob b/objects/clutter/smoleicespike3.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-3.iob
rename to objects/clutter/smoleicespike3.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-4.iob b/objects/clutter/smoleicespike4.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-4.iob
rename to objects/clutter/smoleicespike4.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-5.iob b/objects/clutter/smoleicespike5.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-5.iob
rename to objects/clutter/smoleicespike5.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-6.iob b/objects/clutter/smoleicespike6.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-6.iob
rename to objects/clutter/smoleicespike6.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-7.iob b/objects/clutter/smoleicespike7.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-7.iob
rename to objects/clutter/smoleicespike7.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-8.iob b/objects/clutter/smoleicespike8.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-8.iob
rename to objects/clutter/smoleicespike8.iob
diff --git a/objects/clutter/ice-spikes/smol-ice-spike-9.iob b/objects/clutter/smoleicespike9.iob
similarity index 100%
rename from objects/clutter/ice-spikes/smol-ice-spike-9.iob
rename to objects/clutter/smoleicespike9.iob
diff --git a/objects/clutter/camp/soul-camp.iob b/objects/clutter/soulcamp1.iob
similarity index 100%
rename from objects/clutter/camp/soul-camp.iob
rename to objects/clutter/soulcamp1.iob
diff --git a/objects/clutter/global-clutter/sphinxToomb-1.iob b/objects/clutter/sphinx1.iob
similarity index 100%
rename from objects/clutter/global-clutter/sphinxToomb-1.iob
rename to objects/clutter/sphinx1.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-1.iob b/objects/clutter/spikestone1.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-1.iob
rename to objects/clutter/spikestone1.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-2.iob b/objects/clutter/spikestone2.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-2.iob
rename to objects/clutter/spikestone2.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-3.iob b/objects/clutter/spikestone3.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-3.iob
rename to objects/clutter/spikestone3.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-4.iob b/objects/clutter/spikestone4.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-4.iob
rename to objects/clutter/spikestone4.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-5.iob b/objects/clutter/spikestone5.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-5.iob
rename to objects/clutter/spikestone5.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-6.iob b/objects/clutter/spikestone6.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-6.iob
rename to objects/clutter/spikestone6.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-7.iob b/objects/clutter/spikestone7.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-7.iob
rename to objects/clutter/spikestone7.iob
diff --git a/objects/clutter/stone-clutt/stone-spike-8.iob b/objects/clutter/spikestone8.iob
similarity index 100%
rename from objects/clutter/stone-clutt/stone-spike-8.iob
rename to objects/clutter/spikestone8.iob
diff --git a/objects/clutter/clutter/spruce-clutt-1.iob b/objects/clutter/spruceclutt1.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutt-1.iob
rename to objects/clutter/spruceclutt1.iob
diff --git a/objects/clutter/clutter/spruce-clutt-2.iob b/objects/clutter/spruceclutt2.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutt-2.iob
rename to objects/clutter/spruceclutt2.iob
diff --git a/objects/clutter/clutter/spruce-clutt-3.iob b/objects/clutter/spruceclutt3.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutt-3.iob
rename to objects/clutter/spruceclutt3.iob
diff --git a/objects/clutter/clutter/spruce-clutt-4.iob b/objects/clutter/spruceclutt4.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutt-4.iob
rename to objects/clutter/spruceclutt4.iob
diff --git a/objects/clutter/clutter/spruce-clutt-5.iob b/objects/clutter/spruceclutt5.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutt-5.iob
rename to objects/clutter/spruceclutt5.iob
diff --git a/objects/clutter/clutter/spruce-clutter.iob b/objects/clutter/spruceclutt6.iob
similarity index 100%
rename from objects/clutter/clutter/spruce-clutter.iob
rename to objects/clutter/spruceclutt6.iob
diff --git a/objects/clutter/redwood/rock-1.iob b/objects/clutter/srock1.iob
similarity index 100%
rename from objects/clutter/redwood/rock-1.iob
rename to objects/clutter/srock1.iob
diff --git a/objects/clutter/redwood/rock-2.iob b/objects/clutter/srock2.iob
similarity index 100%
rename from objects/clutter/redwood/rock-2.iob
rename to objects/clutter/srock2.iob
diff --git a/objects/clutter/shrub/shrub1.iob b/objects/clutter/sshrubb1.iob
similarity index 100%
rename from objects/clutter/shrub/shrub1.iob
rename to objects/clutter/sshrubb1.iob
diff --git a/objects/clutter/shrub/shrub2.iob b/objects/clutter/sshrubb2.iob
similarity index 100%
rename from objects/clutter/shrub/shrub2.iob
rename to objects/clutter/sshrubb2.iob
diff --git a/objects/clutter/shrub/shrub3.iob b/objects/clutter/sshrubb3.iob
similarity index 100%
rename from objects/clutter/shrub/shrub3.iob
rename to objects/clutter/sshrubb3.iob
diff --git a/objects/clutter/boulder-stone/boulder1.iob b/objects/clutter/stoneboulder1.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder1.iob
rename to objects/clutter/stoneboulder1.iob
diff --git a/objects/clutter/boulder-stone/boulder4.iob b/objects/clutter/stoneboulder10.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder4.iob
rename to objects/clutter/stoneboulder10.iob
diff --git a/objects/clutter/boulder-stone/boulder5.iob b/objects/clutter/stoneboulder11.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder5.iob
rename to objects/clutter/stoneboulder11.iob
diff --git a/objects/clutter/boulder-stone/boulder6.iob b/objects/clutter/stoneboulder12.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder6.iob
rename to objects/clutter/stoneboulder12.iob
diff --git a/objects/clutter/boulder-stone/boulder7.iob b/objects/clutter/stoneboulder13.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder7.iob
rename to objects/clutter/stoneboulder13.iob
diff --git a/objects/clutter/boulder-stone/boulder8.iob b/objects/clutter/stoneboulder14.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder8.iob
rename to objects/clutter/stoneboulder14.iob
diff --git a/objects/clutter/boulder-stone/boulder9.iob b/objects/clutter/stoneboulder15.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder9.iob
rename to objects/clutter/stoneboulder15.iob
diff --git a/objects/clutter/boulder-stone/boulder10.iob b/objects/clutter/stoneboulder2.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder10.iob
rename to objects/clutter/stoneboulder2.iob
diff --git a/objects/clutter/boulder-stone/boulder11.iob b/objects/clutter/stoneboulder3.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder11.iob
rename to objects/clutter/stoneboulder3.iob
diff --git a/objects/clutter/boulder-stone/boulder12.iob b/objects/clutter/stoneboulder4.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder12.iob
rename to objects/clutter/stoneboulder4.iob
diff --git a/objects/clutter/boulder-stone/boulder13.iob b/objects/clutter/stoneboulder5.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder13.iob
rename to objects/clutter/stoneboulder5.iob
diff --git a/objects/clutter/boulder-stone/boulder14.iob b/objects/clutter/stoneboulder6.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder14.iob
rename to objects/clutter/stoneboulder6.iob
diff --git a/objects/clutter/boulder-stone/boulder15.iob b/objects/clutter/stoneboulder7.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder15.iob
rename to objects/clutter/stoneboulder7.iob
diff --git a/objects/clutter/boulder-stone/boulder2.iob b/objects/clutter/stoneboulder8.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder2.iob
rename to objects/clutter/stoneboulder8.iob
diff --git a/objects/clutter/boulder-stone/boulder3.iob b/objects/clutter/stoneboulder9.iob
similarity index 100%
rename from objects/clutter/boulder-stone/boulder3.iob
rename to objects/clutter/stoneboulder9.iob
diff --git a/objects/clutter/clutter/stone-clutt-1.iob b/objects/clutter/stoneclutt1.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-1.iob
rename to objects/clutter/stoneclutt1.iob
diff --git a/objects/clutter/clutter/stone-clutt-2.iob b/objects/clutter/stoneclutt2.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-2.iob
rename to objects/clutter/stoneclutt2.iob
diff --git a/objects/clutter/clutter/stone-clutt-3.iob b/objects/clutter/stoneclutt3.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-3.iob
rename to objects/clutter/stoneclutt3.iob
diff --git a/objects/clutter/clutter/stone-clutt-4.iob b/objects/clutter/stoneclutt4.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-4.iob
rename to objects/clutter/stoneclutt4.iob
diff --git a/objects/clutter/clutter/stone-clutt-5.iob b/objects/clutter/stoneclutt5.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-5.iob
rename to objects/clutter/stoneclutt5.iob
diff --git a/objects/clutter/clutter/stone-clutt-6.iob b/objects/clutter/stoneclutt6.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-6.iob
rename to objects/clutter/stoneclutt6.iob
diff --git a/objects/clutter/clutter/stone-clutt-7.iob b/objects/clutter/stoneclutt7.iob
similarity index 100%
rename from objects/clutter/clutter/stone-clutt-7.iob
rename to objects/clutter/stoneclutt7.iob
diff --git a/objects/clutter/coral/stonedirtsetter-1.iob b/objects/clutter/stonedirtsetter1.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-1.iob
rename to objects/clutter/stonedirtsetter1.iob
diff --git a/objects/clutter/coral/stonedirtsetter-2.iob b/objects/clutter/stonedirtsetter2.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-2.iob
rename to objects/clutter/stonedirtsetter2.iob
diff --git a/objects/clutter/coral/stonedirtsetter-3.iob b/objects/clutter/stonedirtsetter3.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-3.iob
rename to objects/clutter/stonedirtsetter3.iob
diff --git a/objects/clutter/coral/stonedirtsetter-4.iob b/objects/clutter/stonedirtsetter4.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-4.iob
rename to objects/clutter/stonedirtsetter4.iob
diff --git a/objects/clutter/coral/stonedirtsetter-5.iob b/objects/clutter/stonedirtsetter5.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-5.iob
rename to objects/clutter/stonedirtsetter5.iob
diff --git a/objects/clutter/coral/stonedirtsetter-6.iob b/objects/clutter/stonedirtsetter6.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-6.iob
rename to objects/clutter/stonedirtsetter6.iob
diff --git a/objects/clutter/coral/stonedirtsetter-7.iob b/objects/clutter/stonedirtsetter7.iob
similarity index 100%
rename from objects/clutter/coral/stonedirtsetter-7.iob
rename to objects/clutter/stonedirtsetter7.iob
diff --git a/objects/clutter/stump/stump1.iob b/objects/clutter/stump1.iob
similarity index 100%
rename from objects/clutter/stump/stump1.iob
rename to objects/clutter/stump1.iob
diff --git a/objects/clutter/stump/stump2.iob b/objects/clutter/stump2.iob
similarity index 100%
rename from objects/clutter/stump/stump2.iob
rename to objects/clutter/stump2.iob
diff --git a/objects/clutter/stump/stump3.iob b/objects/clutter/stump3.iob
similarity index 100%
rename from objects/clutter/stump/stump3.iob
rename to objects/clutter/stump3.iob
diff --git a/objects/clutter/stump/stump4.iob b/objects/clutter/stump4.iob
similarity index 100%
rename from objects/clutter/stump/stump4.iob
rename to objects/clutter/stump4.iob
diff --git a/objects/clutter/stump/stump5.iob b/objects/clutter/stump5.iob
similarity index 100%
rename from objects/clutter/stump/stump5.iob
rename to objects/clutter/stump5.iob
diff --git a/objects/clutter/stump/stump6.iob b/objects/clutter/stump6.iob
similarity index 100%
rename from objects/clutter/stump/stump6.iob
rename to objects/clutter/stump6.iob
diff --git a/objects/clutter/stump-dark/stump3.iob b/objects/clutter/stump7.iob
similarity index 100%
rename from objects/clutter/stump-dark/stump3.iob
rename to objects/clutter/stump7.iob
diff --git a/objects/clutter/statue/sub-stat-1.iob b/objects/clutter/substat1.iob
similarity index 100%
rename from objects/clutter/statue/sub-stat-1.iob
rename to objects/clutter/substat1.iob
diff --git a/objects/clutter/statue/sub-stat-2.iob b/objects/clutter/substat2.iob
similarity index 100%
rename from objects/clutter/statue/sub-stat-2.iob
rename to objects/clutter/substat2.iob
diff --git a/objects/clutter/statue/sub-stat-3.iob b/objects/clutter/substat3.iob
similarity index 100%
rename from objects/clutter/statue/sub-stat-3.iob
rename to objects/clutter/substat3.iob
diff --git a/objects/clutter/statue/sub-stat-4.iob b/objects/clutter/substat4.iob
similarity index 100%
rename from objects/clutter/statue/sub-stat-4.iob
rename to objects/clutter/substat4.iob
diff --git a/objects/clutter/statue/sub-stat-5.iob b/objects/clutter/substat5.iob
similarity index 100%
rename from objects/clutter/statue/sub-stat-5.iob
rename to objects/clutter/substat5.iob
diff --git a/objects/clutter/global-clutter/BigSwordPortal-lit-1.iob b/objects/clutter/swordnp1.iob
similarity index 100%
rename from objects/clutter/global-clutter/BigSwordPortal-lit-1.iob
rename to objects/clutter/swordnp1.iob
diff --git a/objects/clutter/global-clutter/BigSwordPortal-unlit-1.iob b/objects/clutter/swordnp2.iob
similarity index 100%
rename from objects/clutter/global-clutter/BigSwordPortal-unlit-1.iob
rename to objects/clutter/swordnp2.iob
diff --git a/objects/clutter/global-clutter/BigSwordPortalSTR-lit-2.iob b/objects/clutter/swordnpstr1.iob
similarity index 100%
rename from objects/clutter/global-clutter/BigSwordPortalSTR-lit-2.iob
rename to objects/clutter/swordnpstr1.iob
diff --git a/objects/clutter/global-clutter/BigSwordPortalSTR-unlit-2.iob b/objects/clutter/swordnpstr2.iob
similarity index 100%
rename from objects/clutter/global-clutter/BigSwordPortalSTR-unlit-2.iob
rename to objects/clutter/swordnpstr2.iob
diff --git a/objects/clutter/misc/tntower-1.iob b/objects/clutter/tntower1.iob
similarity index 100%
rename from objects/clutter/misc/tntower-1.iob
rename to objects/clutter/tntower1.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter1.iob b/objects/clutter/tourmaclutt1.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter1.iob
rename to objects/clutter/tourmaclutt1.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter18.iob b/objects/clutter/tourmaclutt10.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter18.iob
rename to objects/clutter/tourmaclutt10.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter19.iob b/objects/clutter/tourmaclutt11.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter19.iob
rename to objects/clutter/tourmaclutt11.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter2.iob b/objects/clutter/tourmaclutt12.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter2.iob
rename to objects/clutter/tourmaclutt12.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter20.iob b/objects/clutter/tourmaclutt13.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter20.iob
rename to objects/clutter/tourmaclutt13.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter21.iob b/objects/clutter/tourmaclutt14.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter21.iob
rename to objects/clutter/tourmaclutt14.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter22.iob b/objects/clutter/tourmaclutt15.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter22.iob
rename to objects/clutter/tourmaclutt15.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter23.iob b/objects/clutter/tourmaclutt16.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter23.iob
rename to objects/clutter/tourmaclutt16.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter24.iob b/objects/clutter/tourmaclutt17.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter24.iob
rename to objects/clutter/tourmaclutt17.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter25.iob b/objects/clutter/tourmaclutt18.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter25.iob
rename to objects/clutter/tourmaclutt18.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter3.iob b/objects/clutter/tourmaclutt19.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter3.iob
rename to objects/clutter/tourmaclutt19.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter10.iob b/objects/clutter/tourmaclutt2.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter10.iob
rename to objects/clutter/tourmaclutt2.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter4.iob b/objects/clutter/tourmaclutt20.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter4.iob
rename to objects/clutter/tourmaclutt20.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter5.iob b/objects/clutter/tourmaclutt21.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter5.iob
rename to objects/clutter/tourmaclutt21.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter6.iob b/objects/clutter/tourmaclutt22.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter6.iob
rename to objects/clutter/tourmaclutt22.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter7.iob b/objects/clutter/tourmaclutt23.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter7.iob
rename to objects/clutter/tourmaclutt23.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter8.iob b/objects/clutter/tourmaclutt24.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter8.iob
rename to objects/clutter/tourmaclutt24.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter9.iob b/objects/clutter/tourmaclutt25.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter9.iob
rename to objects/clutter/tourmaclutt25.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter11.iob b/objects/clutter/tourmaclutt3.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter11.iob
rename to objects/clutter/tourmaclutt3.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter12.iob b/objects/clutter/tourmaclutt4.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter12.iob
rename to objects/clutter/tourmaclutt4.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter13.iob b/objects/clutter/tourmaclutt5.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter13.iob
rename to objects/clutter/tourmaclutt5.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter14.iob b/objects/clutter/tourmaclutt6.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter14.iob
rename to objects/clutter/tourmaclutt6.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter15.iob b/objects/clutter/tourmaclutt7.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter15.iob
rename to objects/clutter/tourmaclutt7.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter16.iob b/objects/clutter/tourmaclutt8.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter16.iob
rename to objects/clutter/tourmaclutt8.iob
diff --git a/objects/clutter/oakbush-tclutter/TClutter17.iob b/objects/clutter/tourmaclutt9.iob
similarity index 100%
rename from objects/clutter/oakbush-tclutter/TClutter17.iob
rename to objects/clutter/tourmaclutt9.iob
diff --git a/objects/clutter/ice-spikes/tp-1.iob b/objects/clutter/twoicespike1.iob
similarity index 100%
rename from objects/clutter/ice-spikes/tp-1.iob
rename to objects/clutter/twoicespike1.iob
diff --git a/objects/clutter/ice-spikes/tp-2.iob b/objects/clutter/twoicespike2.iob
similarity index 100%
rename from objects/clutter/ice-spikes/tp-2.iob
rename to objects/clutter/twoicespike2.iob
diff --git a/objects/clutter/ice-spikes/tp-3.iob b/objects/clutter/twoicespike3.iob
similarity index 100%
rename from objects/clutter/ice-spikes/tp-3.iob
rename to objects/clutter/twoicespike3.iob
diff --git a/objects/clutter/ice-spikes/tp-4.iob b/objects/clutter/twoicespike4.iob
similarity index 100%
rename from objects/clutter/ice-spikes/tp-4.iob
rename to objects/clutter/twoicespike4.iob
diff --git a/objects/clutter/shack/wornWorkshop.iob b/objects/clutter/workshop1.iob
similarity index 100%
rename from objects/clutter/shack/wornWorkshop.iob
rename to objects/clutter/workshop1.iob
diff --git a/objects/clutter/fossil/skull_1.iob b/objects/jigsaw/fossil/skull_1.iob
similarity index 100%
rename from objects/clutter/fossil/skull_1.iob
rename to objects/jigsaw/fossil/skull_1.iob
diff --git a/objects/clutter/fossil/skull_1_coal.iob b/objects/jigsaw/fossil/skull_1_coal.iob
similarity index 100%
rename from objects/clutter/fossil/skull_1_coal.iob
rename to objects/jigsaw/fossil/skull_1_coal.iob
diff --git a/objects/clutter/fossil/skull_2.iob b/objects/jigsaw/fossil/skull_2.iob
similarity index 100%
rename from objects/clutter/fossil/skull_2.iob
rename to objects/jigsaw/fossil/skull_2.iob
diff --git a/objects/clutter/fossil/skull_2_coal.iob b/objects/jigsaw/fossil/skull_2_coal.iob
similarity index 100%
rename from objects/clutter/fossil/skull_2_coal.iob
rename to objects/jigsaw/fossil/skull_2_coal.iob
diff --git a/objects/clutter/fossil/skull_3.iob b/objects/jigsaw/fossil/skull_3.iob
similarity index 100%
rename from objects/clutter/fossil/skull_3.iob
rename to objects/jigsaw/fossil/skull_3.iob
diff --git a/objects/clutter/fossil/skull_3_coal.iob b/objects/jigsaw/fossil/skull_3_coal.iob
similarity index 100%
rename from objects/clutter/fossil/skull_3_coal.iob
rename to objects/jigsaw/fossil/skull_3_coal.iob
diff --git a/objects/clutter/fossil/skull_4.iob b/objects/jigsaw/fossil/skull_4.iob
similarity index 100%
rename from objects/clutter/fossil/skull_4.iob
rename to objects/jigsaw/fossil/skull_4.iob
diff --git a/objects/clutter/fossil/skull_4_coal.iob b/objects/jigsaw/fossil/skull_4_coal.iob
similarity index 100%
rename from objects/clutter/fossil/skull_4_coal.iob
rename to objects/jigsaw/fossil/skull_4_coal.iob
diff --git a/objects/clutter/fossil/spine_1.iob b/objects/jigsaw/fossil/spine_1.iob
similarity index 100%
rename from objects/clutter/fossil/spine_1.iob
rename to objects/jigsaw/fossil/spine_1.iob
diff --git a/objects/clutter/fossil/spine_1_coal.iob b/objects/jigsaw/fossil/spine_1_coal.iob
similarity index 100%
rename from objects/clutter/fossil/spine_1_coal.iob
rename to objects/jigsaw/fossil/spine_1_coal.iob
diff --git a/objects/clutter/fossil/spine_2.iob b/objects/jigsaw/fossil/spine_2.iob
similarity index 100%
rename from objects/clutter/fossil/spine_2.iob
rename to objects/jigsaw/fossil/spine_2.iob
diff --git a/objects/clutter/fossil/spine_2_coal.iob b/objects/jigsaw/fossil/spine_2_coal.iob
similarity index 100%
rename from objects/clutter/fossil/spine_2_coal.iob
rename to objects/jigsaw/fossil/spine_2_coal.iob
diff --git a/objects/clutter/fossil/spine_3.iob b/objects/jigsaw/fossil/spine_3.iob
similarity index 100%
rename from objects/clutter/fossil/spine_3.iob
rename to objects/jigsaw/fossil/spine_3.iob
diff --git a/objects/clutter/fossil/spine_3_coal.iob b/objects/jigsaw/fossil/spine_3_coal.iob
similarity index 100%
rename from objects/clutter/fossil/spine_3_coal.iob
rename to objects/jigsaw/fossil/spine_3_coal.iob
diff --git a/objects/clutter/fossil/spine_4.iob b/objects/jigsaw/fossil/spine_4.iob
similarity index 100%
rename from objects/clutter/fossil/spine_4.iob
rename to objects/jigsaw/fossil/spine_4.iob
diff --git a/objects/clutter/fossil/spine_4_coal.iob b/objects/jigsaw/fossil/spine_4_coal.iob
similarity index 100%
rename from objects/clutter/fossil/spine_4_coal.iob
rename to objects/jigsaw/fossil/spine_4_coal.iob
diff --git a/objects/clutter/nether_fossils/fossil_1.iob b/objects/jigsaw/nether_fossils/fossil_1.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_1.iob
rename to objects/jigsaw/nether_fossils/fossil_1.iob
diff --git a/objects/clutter/nether_fossils/fossil_10.iob b/objects/jigsaw/nether_fossils/fossil_10.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_10.iob
rename to objects/jigsaw/nether_fossils/fossil_10.iob
diff --git a/objects/clutter/nether_fossils/fossil_11.iob b/objects/jigsaw/nether_fossils/fossil_11.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_11.iob
rename to objects/jigsaw/nether_fossils/fossil_11.iob
diff --git a/objects/clutter/nether_fossils/fossil_12.iob b/objects/jigsaw/nether_fossils/fossil_12.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_12.iob
rename to objects/jigsaw/nether_fossils/fossil_12.iob
diff --git a/objects/clutter/nether_fossils/fossil_13.iob b/objects/jigsaw/nether_fossils/fossil_13.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_13.iob
rename to objects/jigsaw/nether_fossils/fossil_13.iob
diff --git a/objects/clutter/nether_fossils/fossil_14.iob b/objects/jigsaw/nether_fossils/fossil_14.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_14.iob
rename to objects/jigsaw/nether_fossils/fossil_14.iob
diff --git a/objects/clutter/nether_fossils/fossil_2.iob b/objects/jigsaw/nether_fossils/fossil_2.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_2.iob
rename to objects/jigsaw/nether_fossils/fossil_2.iob
diff --git a/objects/clutter/nether_fossils/fossil_3.iob b/objects/jigsaw/nether_fossils/fossil_3.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_3.iob
rename to objects/jigsaw/nether_fossils/fossil_3.iob
diff --git a/objects/clutter/nether_fossils/fossil_4.iob b/objects/jigsaw/nether_fossils/fossil_4.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_4.iob
rename to objects/jigsaw/nether_fossils/fossil_4.iob
diff --git a/objects/clutter/nether_fossils/fossil_5.iob b/objects/jigsaw/nether_fossils/fossil_5.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_5.iob
rename to objects/jigsaw/nether_fossils/fossil_5.iob
diff --git a/objects/clutter/nether_fossils/fossil_6.iob b/objects/jigsaw/nether_fossils/fossil_6.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_6.iob
rename to objects/jigsaw/nether_fossils/fossil_6.iob
diff --git a/objects/clutter/nether_fossils/fossil_7.iob b/objects/jigsaw/nether_fossils/fossil_7.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_7.iob
rename to objects/jigsaw/nether_fossils/fossil_7.iob
diff --git a/objects/clutter/nether_fossils/fossil_8.iob b/objects/jigsaw/nether_fossils/fossil_8.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_8.iob
rename to objects/jigsaw/nether_fossils/fossil_8.iob
diff --git a/objects/clutter/nether_fossils/fossil_9.iob b/objects/jigsaw/nether_fossils/fossil_9.iob
similarity index 100%
rename from objects/clutter/nether_fossils/fossil_9.iob
rename to objects/jigsaw/nether_fossils/fossil_9.iob
diff --git a/objects/structures/amethyst/ame6.iob b/objects/structures/amethyst1.iob
similarity index 100%
rename from objects/structures/amethyst/ame6.iob
rename to objects/structures/amethyst1.iob
diff --git a/objects/structures/amethyst/ame5.iob b/objects/structures/amethyst2.iob
similarity index 100%
rename from objects/structures/amethyst/ame5.iob
rename to objects/structures/amethyst2.iob
diff --git a/objects/structures/amethyst/ame4.iob b/objects/structures/amethyst3.iob
similarity index 100%
rename from objects/structures/amethyst/ame4.iob
rename to objects/structures/amethyst3.iob
diff --git a/objects/structures/amethyst/ame3.iob b/objects/structures/amethyst4.iob
similarity index 100%
rename from objects/structures/amethyst/ame3.iob
rename to objects/structures/amethyst4.iob
diff --git a/objects/structures/amethyst/ame2.iob b/objects/structures/amethyst5.iob
similarity index 100%
rename from objects/structures/amethyst/ame2.iob
rename to objects/structures/amethyst5.iob
diff --git a/objects/structures/amethyst/ame1.iob b/objects/structures/amethyst6.iob
similarity index 100%
rename from objects/structures/amethyst/ame1.iob
rename to objects/structures/amethyst6.iob
diff --git a/objects/structures/hand-bone/boneHand3.iob b/objects/structures/bonehand1.iob
similarity index 100%
rename from objects/structures/hand-bone/boneHand3.iob
rename to objects/structures/bonehand1.iob
diff --git a/objects/structures/hand-bone/boneHand2.iob b/objects/structures/bonehand2.iob
similarity index 100%
rename from objects/structures/hand-bone/boneHand2.iob
rename to objects/structures/bonehand2.iob
diff --git a/objects/structures/hand-bone/boneHand1.iob b/objects/structures/bonehand3.iob
similarity index 100%
rename from objects/structures/hand-bone/boneHand1.iob
rename to objects/structures/bonehand3.iob
diff --git a/objects/structures/BROKEN WINDMILL/ruin1.iob b/objects/structures/brokmill1.iob
similarity index 100%
rename from objects/structures/BROKEN WINDMILL/ruin1.iob
rename to objects/structures/brokmill1.iob
diff --git a/objects/structures/caves/cave6.iob b/objects/structures/cave1.iob
similarity index 100%
rename from objects/structures/caves/cave6.iob
rename to objects/structures/cave1.iob
diff --git a/objects/structures/caves/cave5.iob b/objects/structures/cave2.iob
similarity index 100%
rename from objects/structures/caves/cave5.iob
rename to objects/structures/cave2.iob
diff --git a/objects/structures/caves/cave4.iob b/objects/structures/cave3.iob
similarity index 100%
rename from objects/structures/caves/cave4.iob
rename to objects/structures/cave3.iob
diff --git a/objects/structures/caves/cave3.iob b/objects/structures/cave4.iob
similarity index 100%
rename from objects/structures/caves/cave3.iob
rename to objects/structures/cave4.iob
diff --git a/objects/structures/caves/cave2.iob b/objects/structures/cave5.iob
similarity index 100%
rename from objects/structures/caves/cave2.iob
rename to objects/structures/cave5.iob
diff --git a/objects/structures/caves/cave1.iob b/objects/structures/cave6.iob
similarity index 100%
rename from objects/structures/caves/cave1.iob
rename to objects/structures/cave6.iob
diff --git a/objects/structures/crystal/crystal-9.iob b/objects/structures/crystal1.iob
similarity index 100%
rename from objects/structures/crystal/crystal-9.iob
rename to objects/structures/crystal1.iob
diff --git a/objects/structures/crystal/crystal-1.iob b/objects/structures/crystal10.iob
similarity index 100%
rename from objects/structures/crystal/crystal-1.iob
rename to objects/structures/crystal10.iob
diff --git a/objects/structures/crystal/crystal-8.iob b/objects/structures/crystal2.iob
similarity index 100%
rename from objects/structures/crystal/crystal-8.iob
rename to objects/structures/crystal2.iob
diff --git a/objects/structures/crystal/crystal-7.iob b/objects/structures/crystal3.iob
similarity index 100%
rename from objects/structures/crystal/crystal-7.iob
rename to objects/structures/crystal3.iob
diff --git a/objects/structures/crystal/crystal-6.iob b/objects/structures/crystal4.iob
similarity index 100%
rename from objects/structures/crystal/crystal-6.iob
rename to objects/structures/crystal4.iob
diff --git a/objects/structures/crystal/crystal-5.iob b/objects/structures/crystal5.iob
similarity index 100%
rename from objects/structures/crystal/crystal-5.iob
rename to objects/structures/crystal5.iob
diff --git a/objects/structures/crystal/crystal-4.iob b/objects/structures/crystal6.iob
similarity index 100%
rename from objects/structures/crystal/crystal-4.iob
rename to objects/structures/crystal6.iob
diff --git a/objects/structures/crystal/crystal-3.iob b/objects/structures/crystal7.iob
similarity index 100%
rename from objects/structures/crystal/crystal-3.iob
rename to objects/structures/crystal7.iob
diff --git a/objects/structures/crystal/crystal-2.iob b/objects/structures/crystal8.iob
similarity index 100%
rename from objects/structures/crystal/crystal-2.iob
rename to objects/structures/crystal8.iob
diff --git a/objects/structures/crystal/crystal-10.iob b/objects/structures/crystal9.iob
similarity index 100%
rename from objects/structures/crystal/crystal-10.iob
rename to objects/structures/crystal9.iob
diff --git a/objects/structures/deepslate/ds3.iob b/objects/structures/deepslate1.iob
similarity index 100%
rename from objects/structures/deepslate/ds3.iob
rename to objects/structures/deepslate1.iob
diff --git a/objects/structures/deepslate/ds2.iob b/objects/structures/deepslate2.iob
similarity index 100%
rename from objects/structures/deepslate/ds2.iob
rename to objects/structures/deepslate2.iob
diff --git a/objects/structures/deepslate/ds1.iob b/objects/structures/deepslate3.iob
similarity index 100%
rename from objects/structures/deepslate/ds1.iob
rename to objects/structures/deepslate3.iob
diff --git a/objects/structures/FloatIsle/f-1.iob b/objects/structures/floatisle1.iob
similarity index 100%
rename from objects/structures/FloatIsle/f-1.iob
rename to objects/structures/floatisle1.iob
diff --git a/objects/structures/ships/gall-1.iob b/objects/structures/gall1.iob
similarity index 100%
rename from objects/structures/ships/gall-1.iob
rename to objects/structures/gall1.iob
diff --git a/objects/structures/ships/gall-2.iob b/objects/structures/gall2.iob
similarity index 100%
rename from objects/structures/ships/gall-2.iob
rename to objects/structures/gall2.iob
diff --git a/objects/structures/ships/gall-3.iob b/objects/structures/gall3.iob
similarity index 100%
rename from objects/structures/ships/gall-3.iob
rename to objects/structures/gall3.iob
diff --git a/objects/structures/ships/generic.iob b/objects/structures/generic.iob
similarity index 100%
rename from objects/structures/ships/generic.iob
rename to objects/structures/generic.iob
diff --git a/objects/structures/ships/generic-c.iob b/objects/structures/genericc.iob
similarity index 100%
rename from objects/structures/ships/generic-c.iob
rename to objects/structures/genericc.iob
diff --git a/objects/structures/ships/generic-g.iob b/objects/structures/genericg.iob
similarity index 100%
rename from objects/structures/ships/generic-g.iob
rename to objects/structures/genericg.iob
diff --git a/objects/structures/ships/generic-r.iob b/objects/structures/genericr.iob
similarity index 100%
rename from objects/structures/ships/generic-r.iob
rename to objects/structures/genericr.iob
diff --git a/objects/structures/ships/generic-u.iob b/objects/structures/genericu.iob
similarity index 100%
rename from objects/structures/ships/generic-u.iob
rename to objects/structures/genericu.iob
diff --git a/objects/structures/ships/generic-w.iob b/objects/structures/genericw.iob
similarity index 100%
rename from objects/structures/ships/generic-w.iob
rename to objects/structures/genericw.iob
diff --git a/objects/structures/beach-islander/easterHead1.iob b/objects/structures/islhead1.iob
similarity index 100%
rename from objects/structures/beach-islander/easterHead1.iob
rename to objects/structures/islhead1.iob
diff --git a/objects/structures/landform/underwater/ellipsoid-1.iob b/objects/structures/landform/underwater/ellipsoid-1.iob
deleted file mode 100644
index 53f3b2cf..00000000
Binary files a/objects/structures/landform/underwater/ellipsoid-1.iob and /dev/null differ
diff --git a/objects/structures/landform/spikes/3.iob b/objects/structures/landspike1.iob
similarity index 100%
rename from objects/structures/landform/spikes/3.iob
rename to objects/structures/landspike1.iob
diff --git a/objects/structures/landform/spikes/2.iob b/objects/structures/landspike2.iob
similarity index 100%
rename from objects/structures/landform/spikes/2.iob
rename to objects/structures/landspike2.iob
diff --git a/objects/structures/landform/spikes/1.iob b/objects/structures/landspike3.iob
similarity index 100%
rename from objects/structures/landform/spikes/1.iob
rename to objects/structures/landspike3.iob
diff --git a/objects/structures/landform/stone/5.iob b/objects/structures/landstone1.iob
similarity index 100%
rename from objects/structures/landform/stone/5.iob
rename to objects/structures/landstone1.iob
diff --git a/objects/structures/landform/stone/4.iob b/objects/structures/landstone2.iob
similarity index 100%
rename from objects/structures/landform/stone/4.iob
rename to objects/structures/landstone2.iob
diff --git a/objects/structures/landform/stone/3.iob b/objects/structures/landstone3.iob
similarity index 100%
rename from objects/structures/landform/stone/3.iob
rename to objects/structures/landstone3.iob
diff --git a/objects/structures/landform/stone/2.iob b/objects/structures/landstone4.iob
similarity index 100%
rename from objects/structures/landform/stone/2.iob
rename to objects/structures/landstone4.iob
diff --git a/objects/structures/landform/stone/1.iob b/objects/structures/landstone5.iob
similarity index 100%
rename from objects/structures/landform/stone/1.iob
rename to objects/structures/landstone5.iob
diff --git a/objects/structures/mrock/mrock-5.iob b/objects/structures/mlandstone1.iob
similarity index 100%
rename from objects/structures/mrock/mrock-5.iob
rename to objects/structures/mlandstone1.iob
diff --git a/objects/structures/mrock/mrock-4.iob b/objects/structures/mlandstone2.iob
similarity index 100%
rename from objects/structures/mrock/mrock-4.iob
rename to objects/structures/mlandstone2.iob
diff --git a/objects/structures/mrock/mrock-3.iob b/objects/structures/mlandstone3.iob
similarity index 100%
rename from objects/structures/mrock/mrock-3.iob
rename to objects/structures/mlandstone3.iob
diff --git a/objects/structures/mrock/mrock-2.iob b/objects/structures/mlandstone4.iob
similarity index 100%
rename from objects/structures/mrock/mrock-2.iob
rename to objects/structures/mlandstone4.iob
diff --git a/objects/structures/mrock/mrock-1.iob b/objects/structures/mlandstone5.iob
similarity index 100%
rename from objects/structures/mrock/mrock-1.iob
rename to objects/structures/mlandstone5.iob
diff --git a/objects/structures/monolith/black-6.iob b/objects/structures/monolith1.iob
similarity index 100%
rename from objects/structures/monolith/black-6.iob
rename to objects/structures/monolith1.iob
diff --git a/objects/structures/monolith/black-5.iob b/objects/structures/monolith2.iob
similarity index 100%
rename from objects/structures/monolith/black-5.iob
rename to objects/structures/monolith2.iob
diff --git a/objects/structures/monolith/black-4.iob b/objects/structures/monolith3.iob
similarity index 100%
rename from objects/structures/monolith/black-4.iob
rename to objects/structures/monolith3.iob
diff --git a/objects/structures/monolith/black-3.iob b/objects/structures/monolith4.iob
similarity index 100%
rename from objects/structures/monolith/black-3.iob
rename to objects/structures/monolith4.iob
diff --git a/objects/structures/monolith/black-2.iob b/objects/structures/monolith5.iob
similarity index 100%
rename from objects/structures/monolith/black-2.iob
rename to objects/structures/monolith5.iob
diff --git a/objects/structures/monolith/black-1.iob b/objects/structures/monolith6.iob
similarity index 100%
rename from objects/structures/monolith/black-1.iob
rename to objects/structures/monolith6.iob
diff --git a/objects/structures/ocean-ruins/ruin3.iob b/objects/structures/oruins1.iob
similarity index 100%
rename from objects/structures/ocean-ruins/ruin3.iob
rename to objects/structures/oruins1.iob
diff --git a/objects/structures/ocean-ruins/ruin2.iob b/objects/structures/oruins2.iob
similarity index 100%
rename from objects/structures/ocean-ruins/ruin2.iob
rename to objects/structures/oruins2.iob
diff --git a/objects/structures/ocean-ruins/ruin1.iob b/objects/structures/oruins3.iob
similarity index 100%
rename from objects/structures/ocean-ruins/ruin1.iob
rename to objects/structures/oruins3.iob
diff --git a/objects/structures/gifts/blue.iob b/objects/structures/presentblue19.iob
similarity index 100%
rename from objects/structures/gifts/blue.iob
rename to objects/structures/presentblue19.iob
diff --git a/objects/structures/gifts/blue-a.iob b/objects/structures/presentbluea20.iob
similarity index 100%
rename from objects/structures/gifts/blue-a.iob
rename to objects/structures/presentbluea20.iob
diff --git a/objects/structures/gifts/medium-blue.iob b/objects/structures/presentmediumblue17.iob
similarity index 100%
rename from objects/structures/gifts/medium-blue.iob
rename to objects/structures/presentmediumblue17.iob
diff --git a/objects/structures/gifts/medium-blue-a.iob b/objects/structures/presentmediumbluea18.iob
similarity index 100%
rename from objects/structures/gifts/medium-blue-a.iob
rename to objects/structures/presentmediumbluea18.iob
diff --git a/objects/structures/gifts/medium-red.iob b/objects/structures/presentmediumred15.iob
similarity index 100%
rename from objects/structures/gifts/medium-red.iob
rename to objects/structures/presentmediumred15.iob
diff --git a/objects/structures/gifts/medium-red-a.iob b/objects/structures/presentmediumreda16.iob
similarity index 100%
rename from objects/structures/gifts/medium-red-a.iob
rename to objects/structures/presentmediumreda16.iob
diff --git a/objects/structures/gifts/red.iob b/objects/structures/presentred13.iob
similarity index 100%
rename from objects/structures/gifts/red.iob
rename to objects/structures/presentred13.iob
diff --git a/objects/structures/gifts/red-a.iob b/objects/structures/presentreda14.iob
similarity index 100%
rename from objects/structures/gifts/red-a.iob
rename to objects/structures/presentreda14.iob
diff --git a/objects/structures/gifts/supermassive-blue.iob b/objects/structures/presentsupermassiveblue11.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-blue.iob
rename to objects/structures/presentsupermassiveblue11.iob
diff --git a/objects/structures/gifts/supermassive-blue-a.iob b/objects/structures/presentsupermassivebluea12.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-blue-a.iob
rename to objects/structures/presentsupermassivebluea12.iob
diff --git a/objects/structures/gifts/supermassive-green.iob b/objects/structures/presentsupermassivegreen9.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-green.iob
rename to objects/structures/presentsupermassivegreen9.iob
diff --git a/objects/structures/gifts/supermassive-green-a.iob b/objects/structures/presentsupermassivegreena10.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-green-a.iob
rename to objects/structures/presentsupermassivegreena10.iob
diff --git a/objects/structures/gifts/supermassive-orange.iob b/objects/structures/presentsupermassiveorange7.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-orange.iob
rename to objects/structures/presentsupermassiveorange7.iob
diff --git a/objects/structures/gifts/supermassive-orange-a.iob b/objects/structures/presentsupermassiveorangea8.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-orange-a.iob
rename to objects/structures/presentsupermassiveorangea8.iob
diff --git a/objects/structures/gifts/supermassive-purple.iob b/objects/structures/presentsupermassivepurple5.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-purple.iob
rename to objects/structures/presentsupermassivepurple5.iob
diff --git a/objects/structures/gifts/supermassive-purple-a.iob b/objects/structures/presentsupermassivepurplea6.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-purple-a.iob
rename to objects/structures/presentsupermassivepurplea6.iob
diff --git a/objects/structures/gifts/supermassive-red.iob b/objects/structures/presentsupermassivered3.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-red.iob
rename to objects/structures/presentsupermassivered3.iob
diff --git a/objects/structures/gifts/supermassive-red-a.iob b/objects/structures/presentsupermassivereda4.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-red-a.iob
rename to objects/structures/presentsupermassivereda4.iob
diff --git a/objects/structures/gifts/supermassive-yellow.iob b/objects/structures/presentsupermassiveyellow1.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-yellow.iob
rename to objects/structures/presentsupermassiveyellow1.iob
diff --git a/objects/structures/gifts/supermassive-yellow-a.iob b/objects/structures/presentsupermassiveyellowa2.iob
similarity index 100%
rename from objects/structures/gifts/supermassive-yellow-a.iob
rename to objects/structures/presentsupermassiveyellowa2.iob
diff --git a/objects/structures/ships/ship-1.iob b/objects/structures/ship1.iob
similarity index 100%
rename from objects/structures/ships/ship-1.iob
rename to objects/structures/ship1.iob
diff --git a/objects/structures/ships/ship-2.iob b/objects/structures/ship2.iob
similarity index 100%
rename from objects/structures/ships/ship-2.iob
rename to objects/structures/ship2.iob
diff --git a/objects/structures/shipwreck/rightsideup-backhalf.iob b/objects/structures/shiprightsideupbackhalf.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-backhalf.iob
rename to objects/structures/shiprightsideupbackhalf.iob
diff --git a/objects/structures/shipwreck/rightsideup-backhalf-degraded.iob b/objects/structures/shiprightsideupbackhalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-backhalf-degraded.iob
rename to objects/structures/shiprightsideupbackhalfdegraded.iob
diff --git a/objects/structures/shipwreck/rightsideup-fronthalf.iob b/objects/structures/shiprightsideupfronthalf.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-fronthalf.iob
rename to objects/structures/shiprightsideupfronthalf.iob
diff --git a/objects/structures/shipwreck/rightsideup-fronthalf-degraded.iob b/objects/structures/shiprightsideupfronthalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-fronthalf-degraded.iob
rename to objects/structures/shiprightsideupfronthalfdegraded.iob
diff --git a/objects/structures/shipwreck/rightsideup-full.iob b/objects/structures/shiprightsideupfull.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-full.iob
rename to objects/structures/shiprightsideupfull.iob
diff --git a/objects/structures/shipwreck/rightsideup-full-degraded.iob b/objects/structures/shiprightsideupfulldegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/rightsideup-full-degraded.iob
rename to objects/structures/shiprightsideupfulldegraded.iob
diff --git a/objects/structures/shipwreck/sideways-backhalf.iob b/objects/structures/shipsidewaysbackhalf.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-backhalf.iob
rename to objects/structures/shipsidewaysbackhalf.iob
diff --git a/objects/structures/shipwreck/sideways-backhalf-degraded.iob b/objects/structures/shipsidewaysbackhalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-backhalf-degraded.iob
rename to objects/structures/shipsidewaysbackhalfdegraded.iob
diff --git a/objects/structures/shipwreck/sideways-fronthalf.iob b/objects/structures/shipsidewaysfronthalf.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-fronthalf.iob
rename to objects/structures/shipsidewaysfronthalf.iob
diff --git a/objects/structures/shipwreck/sideways-fronthalf-degraded.iob b/objects/structures/shipsidewaysfronthalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-fronthalf-degraded.iob
rename to objects/structures/shipsidewaysfronthalfdegraded.iob
diff --git a/objects/structures/shipwreck/sideways-full.iob b/objects/structures/shipsidewaysfull.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-full.iob
rename to objects/structures/shipsidewaysfull.iob
diff --git a/objects/structures/shipwreck/sideways-full-degraded.iob b/objects/structures/shipsidewaysfulldegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/sideways-full-degraded.iob
rename to objects/structures/shipsidewaysfulldegraded.iob
diff --git a/objects/structures/shipwreck/upsidedown-backhalf.iob b/objects/structures/shipupsidedownbackhalf.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-backhalf.iob
rename to objects/structures/shipupsidedownbackhalf.iob
diff --git a/objects/structures/shipwreck/upsidedown-backhalf-degraded.iob b/objects/structures/shipupsidedownbackhalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-backhalf-degraded.iob
rename to objects/structures/shipupsidedownbackhalfdegraded.iob
diff --git a/objects/structures/shipwreck/upsidedown-fronthalf.iob b/objects/structures/shipupsidedownfronthalf.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-fronthalf.iob
rename to objects/structures/shipupsidedownfronthalf.iob
diff --git a/objects/structures/shipwreck/upsidedown-fronthalf-degraded.iob b/objects/structures/shipupsidedownfronthalfdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-fronthalf-degraded.iob
rename to objects/structures/shipupsidedownfronthalfdegraded.iob
diff --git a/objects/structures/shipwreck/upsidedown-full.iob b/objects/structures/shipupsidedownfull.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-full.iob
rename to objects/structures/shipupsidedownfull.iob
diff --git a/objects/structures/shipwreck/upsidedown-full-degraded.iob b/objects/structures/shipupsidedownfulldegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/upsidedown-full-degraded.iob
rename to objects/structures/shipupsidedownfulldegraded.iob
diff --git a/objects/structures/shipwreck/with-mast.iob b/objects/structures/shipwithmast.iob
similarity index 100%
rename from objects/structures/shipwreck/with-mast.iob
rename to objects/structures/shipwithmast.iob
diff --git a/objects/structures/shipwreck/with-mast-degraded.iob b/objects/structures/shipwithmastdegraded.iob
similarity index 100%
rename from objects/structures/shipwreck/with-mast-degraded.iob
rename to objects/structures/shipwithmastdegraded.iob
diff --git a/objects/structures/ships/swreck-1.iob b/objects/structures/swreck1.iob
similarity index 100%
rename from objects/structures/ships/swreck-1.iob
rename to objects/structures/swreck1.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold1.iob b/objects/structures/tentaclecold1.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold1.iob
rename to objects/structures/tentaclecold1.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold2.iob b/objects/structures/tentaclecold2.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold2.iob
rename to objects/structures/tentaclecold2.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold3.iob b/objects/structures/tentaclecold3.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold3.iob
rename to objects/structures/tentaclecold3.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold4.iob b/objects/structures/tentaclecold4.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold4.iob
rename to objects/structures/tentaclecold4.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold5.iob b/objects/structures/tentaclecold5.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold5.iob
rename to objects/structures/tentaclecold5.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold6.iob b/objects/structures/tentaclecold6.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold6.iob
rename to objects/structures/tentaclecold6.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold7.iob b/objects/structures/tentaclecold7.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold7.iob
rename to objects/structures/tentaclecold7.iob
diff --git a/objects/structures/tentacle-cold/TentacleCold8.iob b/objects/structures/tentaclecold8.iob
similarity index 100%
rename from objects/structures/tentacle-cold/TentacleCold8.iob
rename to objects/structures/tentaclecold8.iob
diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood3.iob b/objects/structures/tentacledarkwood1.iob
similarity index 100%
rename from objects/structures/tentacle-darkwood/TentacleDarkWood3.iob
rename to objects/structures/tentacledarkwood1.iob
diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood6.iob b/objects/structures/tentacledarkwood2.iob
similarity index 100%
rename from objects/structures/tentacle-darkwood/TentacleDarkWood6.iob
rename to objects/structures/tentacledarkwood2.iob
diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood8.iob b/objects/structures/tentacledarkwood3.iob
similarity index 100%
rename from objects/structures/tentacle-darkwood/TentacleDarkWood8.iob
rename to objects/structures/tentacledarkwood3.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire1.iob b/objects/structures/tentaclefire1.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire1.iob
rename to objects/structures/tentaclefire1.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire2.iob b/objects/structures/tentaclefire2.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire2.iob
rename to objects/structures/tentaclefire2.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire3.iob b/objects/structures/tentaclefire3.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire3.iob
rename to objects/structures/tentaclefire3.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire4.iob b/objects/structures/tentaclefire4.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire4.iob
rename to objects/structures/tentaclefire4.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire5.iob b/objects/structures/tentaclefire5.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire5.iob
rename to objects/structures/tentaclefire5.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire6.iob b/objects/structures/tentaclefire6.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire6.iob
rename to objects/structures/tentaclefire6.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire7.iob b/objects/structures/tentaclefire7.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire7.iob
rename to objects/structures/tentaclefire7.iob
diff --git a/objects/structures/tentacle-fire/TentacleFire8.iob b/objects/structures/tentaclefire8.iob
similarity index 100%
rename from objects/structures/tentacle-fire/TentacleFire8.iob
rename to objects/structures/tentaclefire8.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak1.iob b/objects/structures/tentacleoak1.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak1.iob
rename to objects/structures/tentacleoak1.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak2.iob b/objects/structures/tentacleoak2.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak2.iob
rename to objects/structures/tentacleoak2.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak3.iob b/objects/structures/tentacleoak3.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak3.iob
rename to objects/structures/tentacleoak3.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak4.iob b/objects/structures/tentacleoak4.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak4.iob
rename to objects/structures/tentacleoak4.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak5.iob b/objects/structures/tentacleoak5.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak5.iob
rename to objects/structures/tentacleoak5.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak6.iob b/objects/structures/tentacleoak6.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak6.iob
rename to objects/structures/tentacleoak6.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak7.iob b/objects/structures/tentacleoak7.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak7.iob
rename to objects/structures/tentacleoak7.iob
diff --git a/objects/structures/tentacle-oak/TentacleOak8.iob b/objects/structures/tentacleoak8.iob
similarity index 100%
rename from objects/structures/tentacle-oak/TentacleOak8.iob
rename to objects/structures/tentacleoak8.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy1.iob b/objects/structures/tentacleslime1.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy1.iob
rename to objects/structures/tentacleslime1.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy2.iob b/objects/structures/tentacleslime2.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy2.iob
rename to objects/structures/tentacleslime2.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy3.iob b/objects/structures/tentacleslime3.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy3.iob
rename to objects/structures/tentacleslime3.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy4.iob b/objects/structures/tentacleslime4.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy4.iob
rename to objects/structures/tentacleslime4.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy5.iob b/objects/structures/tentacleslime5.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy5.iob
rename to objects/structures/tentacleslime5.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy7.iob b/objects/structures/tentacleslime6.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy7.iob
rename to objects/structures/tentacleslime6.iob
diff --git a/objects/structures/tentacle-slime/TentacleSlimy8.iob b/objects/structures/tentacleslime7.iob
similarity index 100%
rename from objects/structures/tentacle-slime/TentacleSlimy8.iob
rename to objects/structures/tentacleslime7.iob
diff --git a/objects/structures/ships/usd-ship-1.iob b/objects/structures/usdship1.iob
similarity index 100%
rename from objects/structures/ships/usd-ship-1.iob
rename to objects/structures/usdship1.iob
diff --git a/objects/structures/ships/usd-ship-2.iob b/objects/structures/usdship2.iob
similarity index 100%
rename from objects/structures/ships/usd-ship-2.iob
rename to objects/structures/usdship2.iob
diff --git a/objects/structures/hand-wood/HandJung3.iob b/objects/structures/woodhand1.iob
similarity index 100%
rename from objects/structures/hand-wood/HandJung3.iob
rename to objects/structures/woodhand1.iob
diff --git a/objects/structures/hand-wood/HandJung2.iob b/objects/structures/woodhand2.iob
similarity index 100%
rename from objects/structures/hand-wood/HandJung2.iob
rename to objects/structures/woodhand2.iob
diff --git a/objects/structures/hand-wood/HandJung1.iob b/objects/structures/woodhand3.iob
similarity index 100%
rename from objects/structures/hand-wood/HandJung1.iob
rename to objects/structures/woodhand3.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed1.iob b/objects/trees/mixed/bleedingserralita1.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed1.iob
rename to objects/trees/mixed/bleedingserralita1.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed9.iob b/objects/trees/mixed/bleedingserralita10.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed9.iob
rename to objects/trees/mixed/bleedingserralita10.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed10.iob b/objects/trees/mixed/bleedingserralita2.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed10.iob
rename to objects/trees/mixed/bleedingserralita2.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed2.iob b/objects/trees/mixed/bleedingserralita3.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed2.iob
rename to objects/trees/mixed/bleedingserralita3.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed3.iob b/objects/trees/mixed/bleedingserralita4.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed3.iob
rename to objects/trees/mixed/bleedingserralita4.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed4.iob b/objects/trees/mixed/bleedingserralita5.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed4.iob
rename to objects/trees/mixed/bleedingserralita5.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed5.iob b/objects/trees/mixed/bleedingserralita6.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed5.iob
rename to objects/trees/mixed/bleedingserralita6.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed6.iob b/objects/trees/mixed/bleedingserralita7.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed6.iob
rename to objects/trees/mixed/bleedingserralita7.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed7.iob b/objects/trees/mixed/bleedingserralita8.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed7.iob
rename to objects/trees/mixed/bleedingserralita8.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed8.iob b/objects/trees/mixed/bleedingserralita9.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-alt/ableed8.iob
rename to objects/trees/mixed/bleedingserralita9.iob
diff --git a/objects/trees/mixed/deadwood-tainted/dead1.iob b/objects/trees/mixed/dead1.iob
similarity index 100%
rename from objects/trees/mixed/deadwood-tainted/dead1.iob
rename to objects/trees/mixed/dead1.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree1.iob b/objects/trees/mixed/dotree1.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree1.iob
rename to objects/trees/mixed/dotree1.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree10.iob b/objects/trees/mixed/dotree10.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree10.iob
rename to objects/trees/mixed/dotree10.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree2.iob b/objects/trees/mixed/dotree2.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree2.iob
rename to objects/trees/mixed/dotree2.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree3.iob b/objects/trees/mixed/dotree3.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree3.iob
rename to objects/trees/mixed/dotree3.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree4.iob b/objects/trees/mixed/dotree4.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree4.iob
rename to objects/trees/mixed/dotree4.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree5.iob b/objects/trees/mixed/dotree5.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree5.iob
rename to objects/trees/mixed/dotree5.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree6.iob b/objects/trees/mixed/dotree6.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree6.iob
rename to objects/trees/mixed/dotree6.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree7.iob b/objects/trees/mixed/dotree7.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree7.iob
rename to objects/trees/mixed/dotree7.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree8.iob b/objects/trees/mixed/dotree8.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree8.iob
rename to objects/trees/mixed/dotree8.iob
diff --git a/objects/trees/mixed/mystic-trees/dotree9.iob b/objects/trees/mixed/dotree9.iob
similarity index 100%
rename from objects/trees/mixed/mystic-trees/dotree9.iob
rename to objects/trees/mixed/dotree9.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood1.iob b/objects/trees/mixed/elderredwood1.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood1.iob
rename to objects/trees/mixed/elderredwood1.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood9.iob b/objects/trees/mixed/elderredwood10.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood9.iob
rename to objects/trees/mixed/elderredwood10.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood10.iob b/objects/trees/mixed/elderredwood2.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood10.iob
rename to objects/trees/mixed/elderredwood2.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood2.iob b/objects/trees/mixed/elderredwood3.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood2.iob
rename to objects/trees/mixed/elderredwood3.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood3.iob b/objects/trees/mixed/elderredwood4.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood3.iob
rename to objects/trees/mixed/elderredwood4.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood4.iob b/objects/trees/mixed/elderredwood5.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood4.iob
rename to objects/trees/mixed/elderredwood5.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood5.iob b/objects/trees/mixed/elderredwood6.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood5.iob
rename to objects/trees/mixed/elderredwood6.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood6.iob b/objects/trees/mixed/elderredwood7.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood6.iob
rename to objects/trees/mixed/elderredwood7.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood7.iob b/objects/trees/mixed/elderredwood8.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood7.iob
rename to objects/trees/mixed/elderredwood8.iob
diff --git a/objects/trees/mixed/elder-wood/ElderRedwood8.iob b/objects/trees/mixed/elderredwood9.iob
similarity index 100%
rename from objects/trees/mixed/elder-wood/ElderRedwood8.iob
rename to objects/trees/mixed/elderredwood9.iob
diff --git a/objects/trees/mixed/honey-tree/honey-1.iob b/objects/trees/mixed/honey1.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-1.iob
rename to objects/trees/mixed/honey1.iob
diff --git a/objects/trees/mixed/honey-tree/honey-18.iob b/objects/trees/mixed/honey10.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-18.iob
rename to objects/trees/mixed/honey10.iob
diff --git a/objects/trees/mixed/honey-tree/honey-19.iob b/objects/trees/mixed/honey11.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-19.iob
rename to objects/trees/mixed/honey11.iob
diff --git a/objects/trees/mixed/honey-tree/honey-2.iob b/objects/trees/mixed/honey12.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-2.iob
rename to objects/trees/mixed/honey12.iob
diff --git a/objects/trees/mixed/honey-tree/honey-20.iob b/objects/trees/mixed/honey13.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-20.iob
rename to objects/trees/mixed/honey13.iob
diff --git a/objects/trees/mixed/honey-tree/honey-3.iob b/objects/trees/mixed/honey14.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-3.iob
rename to objects/trees/mixed/honey14.iob
diff --git a/objects/trees/mixed/honey-tree/honey-4.iob b/objects/trees/mixed/honey15.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-4.iob
rename to objects/trees/mixed/honey15.iob
diff --git a/objects/trees/mixed/honey-tree/honey-5.iob b/objects/trees/mixed/honey16.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-5.iob
rename to objects/trees/mixed/honey16.iob
diff --git a/objects/trees/mixed/honey-tree/honey-6.iob b/objects/trees/mixed/honey17.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-6.iob
rename to objects/trees/mixed/honey17.iob
diff --git a/objects/trees/mixed/honey-tree/honey-7.iob b/objects/trees/mixed/honey18.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-7.iob
rename to objects/trees/mixed/honey18.iob
diff --git a/objects/trees/mixed/honey-tree/honey-8.iob b/objects/trees/mixed/honey19.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-8.iob
rename to objects/trees/mixed/honey19.iob
diff --git a/objects/trees/mixed/honey-tree/honey-10.iob b/objects/trees/mixed/honey2.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-10.iob
rename to objects/trees/mixed/honey2.iob
diff --git a/objects/trees/mixed/honey-tree/honey-9.iob b/objects/trees/mixed/honey20.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-9.iob
rename to objects/trees/mixed/honey20.iob
diff --git a/objects/trees/mixed/honey-tree/honey-11.iob b/objects/trees/mixed/honey3.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-11.iob
rename to objects/trees/mixed/honey3.iob
diff --git a/objects/trees/mixed/honey-tree/honey-12.iob b/objects/trees/mixed/honey4.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-12.iob
rename to objects/trees/mixed/honey4.iob
diff --git a/objects/trees/mixed/honey-tree/honey-13.iob b/objects/trees/mixed/honey5.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-13.iob
rename to objects/trees/mixed/honey5.iob
diff --git a/objects/trees/mixed/honey-tree/honey-14.iob b/objects/trees/mixed/honey6.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-14.iob
rename to objects/trees/mixed/honey6.iob
diff --git a/objects/trees/mixed/honey-tree/honey-15.iob b/objects/trees/mixed/honey7.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-15.iob
rename to objects/trees/mixed/honey7.iob
diff --git a/objects/trees/mixed/honey-tree/honey-16.iob b/objects/trees/mixed/honey8.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-16.iob
rename to objects/trees/mixed/honey8.iob
diff --git a/objects/trees/mixed/honey-tree/honey-17.iob b/objects/trees/mixed/honey9.iob
similarity index 100%
rename from objects/trees/mixed/honey-tree/honey-17.iob
rename to objects/trees/mixed/honey9.iob
diff --git a/objects/trees/mixed/dual-tree/infested-palm-1.iob b/objects/trees/mixed/infestedpalm1.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/infested-palm-1.iob
rename to objects/trees/mixed/infestedpalm1.iob
diff --git a/objects/trees/mixed/dual-tree/infested-palm-2.iob b/objects/trees/mixed/infestedpalm2.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/infested-palm-2.iob
rename to objects/trees/mixed/infestedpalm2.iob
diff --git a/objects/trees/mixed/dual-tree/infested-palm-3.iob b/objects/trees/mixed/infestedpalm3.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/infested-palm-3.iob
rename to objects/trees/mixed/infestedpalm3.iob
diff --git a/objects/trees/mixed/dual-tree/infested-palm-4.iob b/objects/trees/mixed/infestedpalm4.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/infested-palm-4.iob
rename to objects/trees/mixed/infestedpalm4.iob
diff --git a/objects/trees/mixed/dual-tree/infested-palm-5.iob b/objects/trees/mixed/infestedpalm5.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/infested-palm-5.iob
rename to objects/trees/mixed/infestedpalm5.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed1.iob b/objects/trees/mixed/largebleedingserralita1.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed1.iob
rename to objects/trees/mixed/largebleedingserralita1.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed2.iob b/objects/trees/mixed/largebleedingserralita2.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed2.iob
rename to objects/trees/mixed/largebleedingserralita2.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed3.iob b/objects/trees/mixed/largebleedingserralita3.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed3.iob
rename to objects/trees/mixed/largebleedingserralita3.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed4.iob b/objects/trees/mixed/largebleedingserralita4.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed4.iob
rename to objects/trees/mixed/largebleedingserralita4.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed5.iob b/objects/trees/mixed/largebleedingserralita5.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed5.iob
rename to objects/trees/mixed/largebleedingserralita5.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed1.iob b/objects/trees/mixed/medbleedingserralita1.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed1.iob
rename to objects/trees/mixed/medbleedingserralita1.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed9.iob b/objects/trees/mixed/medbleedingserralita10.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed9.iob
rename to objects/trees/mixed/medbleedingserralita10.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed10.iob b/objects/trees/mixed/medbleedingserralita2.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed10.iob
rename to objects/trees/mixed/medbleedingserralita2.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed2.iob b/objects/trees/mixed/medbleedingserralita3.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed2.iob
rename to objects/trees/mixed/medbleedingserralita3.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed3.iob b/objects/trees/mixed/medbleedingserralita4.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed3.iob
rename to objects/trees/mixed/medbleedingserralita4.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed4.iob b/objects/trees/mixed/medbleedingserralita5.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed4.iob
rename to objects/trees/mixed/medbleedingserralita5.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed5.iob b/objects/trees/mixed/medbleedingserralita6.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed5.iob
rename to objects/trees/mixed/medbleedingserralita6.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed6.iob b/objects/trees/mixed/medbleedingserralita7.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed6.iob
rename to objects/trees/mixed/medbleedingserralita7.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed7.iob b/objects/trees/mixed/medbleedingserralita8.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed7.iob
rename to objects/trees/mixed/medbleedingserralita8.iob
diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed8.iob b/objects/trees/mixed/medbleedingserralita9.iob
similarity index 100%
rename from objects/trees/mixed/serrulata-bleeding-medium/bleed8.iob
rename to objects/trees/mixed/medbleedingserralita9.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp1.iob b/objects/trees/mixed/purpletourmalinelarge1.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp1.iob
rename to objects/trees/mixed/purpletourmalinelarge1.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp9.iob b/objects/trees/mixed/purpletourmalinelarge10.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp9.iob
rename to objects/trees/mixed/purpletourmalinelarge10.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp10.iob b/objects/trees/mixed/purpletourmalinelarge2.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp10.iob
rename to objects/trees/mixed/purpletourmalinelarge2.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp2.iob b/objects/trees/mixed/purpletourmalinelarge3.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp2.iob
rename to objects/trees/mixed/purpletourmalinelarge3.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp3.iob b/objects/trees/mixed/purpletourmalinelarge4.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp3.iob
rename to objects/trees/mixed/purpletourmalinelarge4.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp4.iob b/objects/trees/mixed/purpletourmalinelarge5.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp4.iob
rename to objects/trees/mixed/purpletourmalinelarge5.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp5.iob b/objects/trees/mixed/purpletourmalinelarge6.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp5.iob
rename to objects/trees/mixed/purpletourmalinelarge6.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp6.iob b/objects/trees/mixed/purpletourmalinelarge7.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp6.iob
rename to objects/trees/mixed/purpletourmalinelarge7.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp7.iob b/objects/trees/mixed/purpletourmalinelarge8.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp7.iob
rename to objects/trees/mixed/purpletourmalinelarge8.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp8.iob b/objects/trees/mixed/purpletourmalinelarge9.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Lpurp8.iob
rename to objects/trees/mixed/purpletourmalinelarge9.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp1.iob b/objects/trees/mixed/purpletourmalinemed1.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp1.iob
rename to objects/trees/mixed/purpletourmalinemed1.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp9.iob b/objects/trees/mixed/purpletourmalinemed10.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp9.iob
rename to objects/trees/mixed/purpletourmalinemed10.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp10.iob b/objects/trees/mixed/purpletourmalinemed2.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp10.iob
rename to objects/trees/mixed/purpletourmalinemed2.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp2.iob b/objects/trees/mixed/purpletourmalinemed3.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp2.iob
rename to objects/trees/mixed/purpletourmalinemed3.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp3.iob b/objects/trees/mixed/purpletourmalinemed4.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp3.iob
rename to objects/trees/mixed/purpletourmalinemed4.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp4.iob b/objects/trees/mixed/purpletourmalinemed5.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp4.iob
rename to objects/trees/mixed/purpletourmalinemed5.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp5.iob b/objects/trees/mixed/purpletourmalinemed6.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp5.iob
rename to objects/trees/mixed/purpletourmalinemed6.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp6.iob b/objects/trees/mixed/purpletourmalinemed7.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp6.iob
rename to objects/trees/mixed/purpletourmalinemed7.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp7.iob b/objects/trees/mixed/purpletourmalinemed8.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp7.iob
rename to objects/trees/mixed/purpletourmalinemed8.iob
diff --git a/objects/trees/mixed/tourmaline-medium/Spurp8.iob b/objects/trees/mixed/purpletourmalinemed9.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-medium/Spurp8.iob
rename to objects/trees/mixed/purpletourmalinemed9.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-1.iob b/objects/trees/mixed/redrecluse1.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-1.iob
rename to objects/trees/mixed/redrecluse1.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-9.iob b/objects/trees/mixed/redrecluse10.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-9.iob
rename to objects/trees/mixed/redrecluse10.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-10.iob b/objects/trees/mixed/redrecluse2.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-10.iob
rename to objects/trees/mixed/redrecluse2.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-2.iob b/objects/trees/mixed/redrecluse3.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-2.iob
rename to objects/trees/mixed/redrecluse3.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-3.iob b/objects/trees/mixed/redrecluse4.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-3.iob
rename to objects/trees/mixed/redrecluse4.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-4.iob b/objects/trees/mixed/redrecluse5.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-4.iob
rename to objects/trees/mixed/redrecluse5.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-5.iob b/objects/trees/mixed/redrecluse6.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-5.iob
rename to objects/trees/mixed/redrecluse6.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-6.iob b/objects/trees/mixed/redrecluse7.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-6.iob
rename to objects/trees/mixed/redrecluse7.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-7.iob b/objects/trees/mixed/redrecluse8.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-7.iob
rename to objects/trees/mixed/redrecluse8.iob
diff --git a/objects/trees/mixed/redwood-recluse/large-8.iob b/objects/trees/mixed/redrecluse9.iob
similarity index 100%
rename from objects/trees/mixed/redwood-recluse/large-8.iob
rename to objects/trees/mixed/redrecluse9.iob
diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-1.iob b/objects/trees/mixed/sandyjungle1.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/sandy-jungle-1.iob
rename to objects/trees/mixed/sandyjungle1.iob
diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-2.iob b/objects/trees/mixed/sandyjungle2.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/sandy-jungle-2.iob
rename to objects/trees/mixed/sandyjungle2.iob
diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-3.iob b/objects/trees/mixed/sandyjungle3.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/sandy-jungle-3.iob
rename to objects/trees/mixed/sandyjungle3.iob
diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-4.iob b/objects/trees/mixed/sandyjungle4.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/sandy-jungle-4.iob
rename to objects/trees/mixed/sandyjungle4.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed1.iob b/objects/trees/mixed/serralutageneric1.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed1.iob
rename to objects/trees/mixed/serralutageneric1.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed9.iob b/objects/trees/mixed/serralutageneric10.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed9.iob
rename to objects/trees/mixed/serralutageneric10.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed10.iob b/objects/trees/mixed/serralutageneric2.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed10.iob
rename to objects/trees/mixed/serralutageneric2.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed2.iob b/objects/trees/mixed/serralutageneric3.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed2.iob
rename to objects/trees/mixed/serralutageneric3.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed3.iob b/objects/trees/mixed/serralutageneric4.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed3.iob
rename to objects/trees/mixed/serralutageneric4.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed4.iob b/objects/trees/mixed/serralutageneric5.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed4.iob
rename to objects/trees/mixed/serralutageneric5.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed5.iob b/objects/trees/mixed/serralutageneric6.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed5.iob
rename to objects/trees/mixed/serralutageneric6.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed6.iob b/objects/trees/mixed/serralutageneric7.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed6.iob
rename to objects/trees/mixed/serralutageneric7.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed7.iob b/objects/trees/mixed/serralutageneric8.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed7.iob
rename to objects/trees/mixed/serralutageneric8.iob
diff --git a/objects/trees/mixed/serrulata/nb-bleed8.iob b/objects/trees/mixed/serralutageneric9.iob
similarity index 100%
rename from objects/trees/mixed/serrulata/nb-bleed8.iob
rename to objects/trees/mixed/serralutageneric9.iob
diff --git a/objects/trees/mixed/sm-tree/oakw-oakl.iob b/objects/trees/mixed/smoakog1.iob
similarity index 100%
rename from objects/trees/mixed/sm-tree/oakw-oakl.iob
rename to objects/trees/mixed/smoakog1.iob
diff --git a/objects/trees/mixed/sm-tree/oakw-oakl-160.iob b/objects/trees/mixed/smoakog160.iob
similarity index 100%
rename from objects/trees/mixed/sm-tree/oakw-oakl-160.iob
rename to objects/trees/mixed/smoakog160.iob
diff --git a/objects/trees/mixed/sm-tree/oakw-oakl-80.iob b/objects/trees/mixed/smoakog80.iob
similarity index 100%
rename from objects/trees/mixed/sm-tree/oakw-oakl-80.iob
rename to objects/trees/mixed/smoakog80.iob
diff --git a/objects/clutter/redwood/small-redwood-1.iob b/objects/trees/mixed/sredwood1.iob
similarity index 100%
rename from objects/clutter/redwood/small-redwood-1.iob
rename to objects/trees/mixed/sredwood1.iob
diff --git a/objects/clutter/redwood/small-redwood-2.iob b/objects/trees/mixed/sredwood2.iob
similarity index 100%
rename from objects/clutter/redwood/small-redwood-2.iob
rename to objects/trees/mixed/sredwood2.iob
diff --git a/objects/clutter/redwood/small-redwood-3.iob b/objects/trees/mixed/sredwood3.iob
similarity index 100%
rename from objects/clutter/redwood/small-redwood-3.iob
rename to objects/trees/mixed/sredwood3.iob
diff --git a/objects/clutter/redwood/small-redwood.iob b/objects/trees/mixed/sredwood4.iob
similarity index 100%
rename from objects/clutter/redwood/small-redwood.iob
rename to objects/trees/mixed/sredwood4.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-1.iob b/objects/trees/mixed/swampcorrupt1.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-1.iob
rename to objects/trees/mixed/swampcorrupt1.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-9.iob b/objects/trees/mixed/swampcorrupt10.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-9.iob
rename to objects/trees/mixed/swampcorrupt10.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-10.iob b/objects/trees/mixed/swampcorrupt2.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-10.iob
rename to objects/trees/mixed/swampcorrupt2.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-2.iob b/objects/trees/mixed/swampcorrupt3.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-2.iob
rename to objects/trees/mixed/swampcorrupt3.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-3.iob b/objects/trees/mixed/swampcorrupt4.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-3.iob
rename to objects/trees/mixed/swampcorrupt4.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-4.iob b/objects/trees/mixed/swampcorrupt5.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-4.iob
rename to objects/trees/mixed/swampcorrupt5.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-5.iob b/objects/trees/mixed/swampcorrupt6.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-5.iob
rename to objects/trees/mixed/swampcorrupt6.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-6.iob b/objects/trees/mixed/swampcorrupt7.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-6.iob
rename to objects/trees/mixed/swampcorrupt7.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-7.iob b/objects/trees/mixed/swampcorrupt8.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-7.iob
rename to objects/trees/mixed/swampcorrupt8.iob
diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-8.iob b/objects/trees/mixed/swampcorrupt9.iob
similarity index 100%
rename from objects/trees/mixed/dual-tree/corrupted-swamp-8.iob
rename to objects/trees/mixed/swampcorrupt9.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp2.iob b/objects/trees/mixed/tourmalinelarge1.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp2.iob
rename to objects/trees/mixed/tourmalinelarge1.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp10.iob b/objects/trees/mixed/tourmalinelarge10.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp10.iob
rename to objects/trees/mixed/tourmalinelarge10.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp3.iob b/objects/trees/mixed/tourmalinelarge2.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp3.iob
rename to objects/trees/mixed/tourmalinelarge2.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp4.iob b/objects/trees/mixed/tourmalinelarge3.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp4.iob
rename to objects/trees/mixed/tourmalinelarge3.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp5.iob b/objects/trees/mixed/tourmalinelarge4.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp5.iob
rename to objects/trees/mixed/tourmalinelarge4.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp6.iob b/objects/trees/mixed/tourmalinelarge5.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp6.iob
rename to objects/trees/mixed/tourmalinelarge5.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp7.iob b/objects/trees/mixed/tourmalinelarge6.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp7.iob
rename to objects/trees/mixed/tourmalinelarge6.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp8.iob b/objects/trees/mixed/tourmalinelarge7.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp8.iob
rename to objects/trees/mixed/tourmalinelarge7.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp9.iob b/objects/trees/mixed/tourmalinelarge8.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp9.iob
rename to objects/trees/mixed/tourmalinelarge8.iob
diff --git a/objects/trees/mixed/tourmaline-large/purp1.iob b/objects/trees/mixed/tourmalinelarge9.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-large/purp1.iob
rename to objects/trees/mixed/tourmalinelarge9.iob
diff --git a/objects/trees/mixed/tourmaline-prob/prob1.iob b/objects/trees/mixed/tourmalineproblem1.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-prob/prob1.iob
rename to objects/trees/mixed/tourmalineproblem1.iob
diff --git a/objects/trees/mixed/tourmaline-prob/prob2.iob b/objects/trees/mixed/tourmalineproblem2.iob
similarity index 100%
rename from objects/trees/mixed/tourmaline-prob/prob2.iob
rename to objects/trees/mixed/tourmalineproblem2.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-9.iob b/objects/trees/mixed/tredwood1.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-9.iob
rename to objects/trees/mixed/tredwood1.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-1.iob b/objects/trees/mixed/tredwood10.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-1.iob
rename to objects/trees/mixed/tredwood10.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-8.iob b/objects/trees/mixed/tredwood2.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-8.iob
rename to objects/trees/mixed/tredwood2.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-7.iob b/objects/trees/mixed/tredwood3.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-7.iob
rename to objects/trees/mixed/tredwood3.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-6.iob b/objects/trees/mixed/tredwood4.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-6.iob
rename to objects/trees/mixed/tredwood4.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-5.iob b/objects/trees/mixed/tredwood5.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-5.iob
rename to objects/trees/mixed/tredwood5.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-4.iob b/objects/trees/mixed/tredwood6.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-4.iob
rename to objects/trees/mixed/tredwood6.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-3.iob b/objects/trees/mixed/tredwood7.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-3.iob
rename to objects/trees/mixed/tredwood7.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-2.iob b/objects/trees/mixed/tredwood8.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-2.iob
rename to objects/trees/mixed/tredwood8.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-10.iob b/objects/trees/mixed/tredwood9.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-10.iob
rename to objects/trees/mixed/tredwood9.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-10-b.iob b/objects/trees/mixed/tredwoodbee1.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-10-b.iob
rename to objects/trees/mixed/tredwoodbee1.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-7-b.iob b/objects/trees/mixed/tredwoodbee2.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-7-b.iob
rename to objects/trees/mixed/tredwoodbee2.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-8-b.iob b/objects/trees/mixed/tredwoodbee3.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-8-b.iob
rename to objects/trees/mixed/tredwoodbee3.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-9-b.iob b/objects/trees/mixed/tredwoodbee4.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-9-b.iob
rename to objects/trees/mixed/tredwoodbee4.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-1.iob b/objects/trees/mixed/tredwoodsmol1.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-small-1.iob
rename to objects/trees/mixed/tredwoodsmol1.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-2.iob b/objects/trees/mixed/tredwoodsmol2.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-small-2.iob
rename to objects/trees/mixed/tredwoodsmol2.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-3.iob b/objects/trees/mixed/tredwoodsmol3.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-small-3.iob
rename to objects/trees/mixed/tredwoodsmol3.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-4.iob b/objects/trees/mixed/tredwoodsmol4.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-small-4.iob
rename to objects/trees/mixed/tredwoodsmol4.iob
diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-5.iob b/objects/trees/mixed/tredwoodsmol5.iob
similarity index 100%
rename from objects/trees/mixed/true-redwood/true-redwood-small-5.iob
rename to objects/trees/mixed/tredwoodsmol5.iob