diff --git a/openjpa-project/src/site/resources/img/appid-hierarchy.png b/openjpa-project/src/site/resources/img/manual/appid-hierarchy.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/appid-hierarchy.png
rename to openjpa-project/src/site/resources/img/manual/appid-hierarchy.png
diff --git a/openjpa-project/src/site/resources/img/basic-coll.png b/openjpa-project/src/site/resources/img/manual/basic-coll.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/basic-coll.png
rename to openjpa-project/src/site/resources/img/manual/basic-coll.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-arch.png b/openjpa-project/src/site/resources/img/manual/ejb3-arch.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-arch.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-arch.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-assoc-table.png b/openjpa-project/src/site/resources/img/manual/ejb3-assoc-table.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-assoc-table.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-assoc-table.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-basic-field.png b/openjpa-project/src/site/resources/img/manual/ejb3-basic-field.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-basic-field.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-basic-field.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-data-model.png b/openjpa-project/src/site/resources/img/manual/ejb3-data-model.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-data-model.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-data-model.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-direct-relation.png b/openjpa-project/src/site/resources/img/manual/ejb3-direct-relation.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-direct-relation.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-direct-relation.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-discrim-all.png b/openjpa-project/src/site/resources/img/manual/ejb3-discrim-all.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-discrim-all.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-discrim-all.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-embedded.png b/openjpa-project/src/site/resources/img/manual/ejb3-embedded.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-embedded.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-embedded.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-exceptions.png b/openjpa-project/src/site/resources/img/manual/ejb3-exceptions.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-exceptions.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-exceptions.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-inher-all.png b/openjpa-project/src/site/resources/img/manual/ejb3-inher-all.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-inher-all.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-inher-all.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-inher-joined.png b/openjpa-project/src/site/resources/img/manual/ejb3-inher-joined.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-inher-joined.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-inher-joined.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-map.png b/openjpa-project/src/site/resources/img/manual/ejb3-map.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-map.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-map.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-mapping-identity.png b/openjpa-project/src/site/resources/img/manual/ejb3-mapping-identity.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-mapping-identity.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-mapping-identity.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-meta-model.png b/openjpa-project/src/site/resources/img/manual/ejb3-meta-model.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-meta-model.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-meta-model.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-query.png b/openjpa-project/src/site/resources/img/manual/ejb3-query.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-query.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-query.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-state-transitions.png b/openjpa-project/src/site/resources/img/manual/ejb3-state-transitions.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-state-transitions.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-state-transitions.png
diff --git a/openjpa-project/src/site/resources/img/ejb3-transaction.png b/openjpa-project/src/site/resources/img/manual/ejb3-transaction.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/ejb3-transaction.png
rename to openjpa-project/src/site/resources/img/manual/ejb3-transaction.png
diff --git a/openjpa-project/src/site/resources/img/embedded-coll.png b/openjpa-project/src/site/resources/img/manual/embedded-coll.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/embedded-coll.png
rename to openjpa-project/src/site/resources/img/manual/embedded-coll.png
diff --git a/openjpa-project/src/site/resources/img/enhancement.png b/openjpa-project/src/site/resources/img/manual/enhancement.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/enhancement.png
rename to openjpa-project/src/site/resources/img/manual/enhancement.png
diff --git a/openjpa-project/src/site/resources/img/entitymanager.png b/openjpa-project/src/site/resources/img/manual/entitymanager.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/entitymanager.png
rename to openjpa-project/src/site/resources/img/manual/entitymanager.png
diff --git a/openjpa-project/src/site/resources/img/entitymanagerfactory.png b/openjpa-project/src/site/resources/img/manual/entitymanagerfactory.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/entitymanagerfactory.png
rename to openjpa-project/src/site/resources/img/manual/entitymanagerfactory.png
diff --git a/openjpa-project/src/site/resources/img/inher-superclass-table.png b/openjpa-project/src/site/resources/img/manual/inher-superclass-table.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/inher-superclass-table.png
rename to openjpa-project/src/site/resources/img/manual/inher-superclass-table.png
diff --git a/openjpa-project/src/site/resources/img/inher-tpc.png b/openjpa-project/src/site/resources/img/manual/inher-tpc.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/inher-tpc.png
rename to openjpa-project/src/site/resources/img/manual/inher-tpc.png
diff --git a/openjpa-project/src/site/resources/img/inv-key-coll.png b/openjpa-project/src/site/resources/img/manual/inv-key-coll.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/inv-key-coll.png
rename to openjpa-project/src/site/resources/img/manual/inv-key-coll.png
diff --git a/openjpa-project/src/site/resources/img/joins-constant.png b/openjpa-project/src/site/resources/img/manual/joins-constant.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/joins-constant.png
rename to openjpa-project/src/site/resources/img/manual/joins-constant.png
diff --git a/openjpa-project/src/site/resources/img/persistence.png b/openjpa-project/src/site/resources/img/manual/persistence.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/persistence.png
rename to openjpa-project/src/site/resources/img/manual/persistence.png
diff --git a/openjpa-project/src/site/resources/img/secondary-table.png b/openjpa-project/src/site/resources/img/manual/secondary-table.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/secondary-table.png
rename to openjpa-project/src/site/resources/img/manual/secondary-table.png
diff --git a/openjpa-project/src/site/resources/img/sqlquery-model.png b/openjpa-project/src/site/resources/img/manual/sqlquery-model.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/sqlquery-model.png
rename to openjpa-project/src/site/resources/img/manual/sqlquery-model.png
diff --git a/openjpa-project/src/site/resources/img/string-rel-map.png b/openjpa-project/src/site/resources/img/manual/string-rel-map.png
similarity index 100%
rename from openjpa-project/src/site/resources/img/string-rel-map.png
rename to openjpa-project/src/site/resources/img/manual/string-rel-map.png