diff --git a/model/carpet.png b/model/composite/asset/carpet.png
similarity index 100%
rename from model/carpet.png
rename to model/composite/asset/carpet.png
diff --git a/model/marble.png b/model/composite/asset/marble.png
similarity index 100%
rename from model/marble.png
rename to model/composite/asset/marble.png
diff --git a/model/sponge.png b/model/composite/asset/sponge.png
similarity index 100%
rename from model/sponge.png
rename to model/composite/asset/sponge.png
diff --git a/model/cloth.xml b/model/composite/cloth.xml
similarity index 100%
rename from model/cloth.xml
rename to model/composite/cloth.xml
diff --git a/model/grid1.xml b/model/composite/grid1.xml
similarity index 100%
rename from model/grid1.xml
rename to model/composite/grid1.xml
diff --git a/model/grid1pin.xml b/model/composite/grid1pin.xml
similarity index 100%
rename from model/grid1pin.xml
rename to model/composite/grid1pin.xml
diff --git a/model/grid2.xml b/model/composite/grid2.xml
similarity index 100%
rename from model/grid2.xml
rename to model/composite/grid2.xml
diff --git a/model/grid2pin.xml b/model/composite/grid2pin.xml
similarity index 100%
rename from model/grid2pin.xml
rename to model/composite/grid2pin.xml
diff --git a/model/loop.xml b/model/composite/loop.xml
similarity index 100%
rename from model/loop.xml
rename to model/composite/loop.xml
diff --git a/model/particle.xml b/model/composite/particle.xml
similarity index 100%
rename from model/particle.xml
rename to model/composite/particle.xml
diff --git a/model/rope.xml b/model/composite/rope.xml
similarity index 100%
rename from model/rope.xml
rename to model/composite/rope.xml
diff --git a/model/scene.xml b/model/composite/scene.xml
similarity index 100%
rename from model/scene.xml
rename to model/composite/scene.xml
diff --git a/model/softbox.xml b/model/composite/softbox.xml
similarity index 100%
rename from model/softbox.xml
rename to model/composite/softbox.xml
diff --git a/model/softcylinder.xml b/model/composite/softcylinder.xml
similarity index 100%
rename from model/softcylinder.xml
rename to model/composite/softcylinder.xml
diff --git a/model/softellipsoid.xml b/model/composite/softellipsoid.xml
similarity index 100%
rename from model/softellipsoid.xml
rename to model/composite/softellipsoid.xml
diff --git a/model/hammock.xml b/model/hammock/hammock.xml
similarity index 100%
rename from model/hammock.xml
rename to model/hammock/hammock.xml
diff --git a/model/humanoid.xml b/model/humanoid/humanoid.xml
similarity index 100%
rename from model/humanoid.xml
rename to model/humanoid/humanoid.xml
diff --git a/model/humanoid100.xml b/model/humanoid100/humanoid100.xml
similarity index 100%
rename from model/humanoid100.xml
rename to model/humanoid100/humanoid100.xml
diff --git a/model/arm26.xml b/model/tendon_arm/arm26.xml
similarity index 100%
rename from model/arm26.xml
rename to model/tendon_arm/arm26.xml
diff --git a/include/uitools.c b/sample/uitools.c
similarity index 100%
rename from include/uitools.c
rename to sample/uitools.c
diff --git a/include/uitools.h b/sample/uitools.h
similarity index 100%
rename from include/uitools.h
rename to sample/uitools.h