diff --git a/entitymanager/ivy.xml b/entitymanager/ivy.xml
deleted file mode 100644
index 7e84d4eae6..0000000000
--- a/entitymanager/ivy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.3"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation=
-                  "http://www.jayasoft.org/misc/ivy/ivy.xsd">
-    <info organisation="org.hibernate" module="entitymanager"/>
-    <configurations>
-        <conf name="default" description="Core module dependencies"/>
-        <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
-    </configurations>
-    <publications>
-        <artifact name="hibernate-entitymanager" conf="default"/>
-    </publications>
-    <dependencies>
-		<!-- compile time dependencies -->
-        <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
-        <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/>
-        <dependency name="annotations" rev="3.4.0.GA" conf="default->default"/>
-        <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.SP1" conf="default->default"/>
-        <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
-        <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/>
-        <dependency org="javassist" name="javassist" rev="3.4.GA" conf="default->default"/>
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>
-
-        <!-- transitive dependencies -->
-        <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/>
-        <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/>
-
-        <!-- test deps -->
-        <dependency org="cglib" name="cglib" rev="2.1_3" conf="test->default"/>
-        <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/>
-        <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/>
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/>
-        <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
-        <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
-    </dependencies>
-</ivy-module>
\ No newline at end of file
diff --git a/entitymanager/lib/README.txt b/entitymanager/lib/README.txt
deleted file mode 100644
index a6dcda0d81..0000000000
--- a/entitymanager/lib/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Hibernate Entity Manager dependencies
-=====================================
-
-
-Core
-====
-hibernate-commons-annotations.jar: required
-ejb3-persistence.jar: required
-hibernate-annotations: required
-hibernate-validator: required
-hibernate3.jar: required
-hibernate core dependencies: required (see Hibernate Core for more information)
-javassist.jar: required (part of Hibernate Core dependencies)
-
-
-Test
-====
-(no extra dependency)
\ No newline at end of file
diff --git a/entitymanager/lib/build/ant-contrib-1.0b2.jar b/entitymanager/lib/build/ant-contrib-1.0b2.jar
deleted file mode 100644
index ea817cd434..0000000000
Binary files a/entitymanager/lib/build/ant-contrib-1.0b2.jar and /dev/null differ
diff --git a/entitymanager/lib/build/ant-junit-1.6.5.jar b/entitymanager/lib/build/ant-junit-1.6.5.jar
deleted file mode 100755
index 5ee4f7ff32..0000000000
Binary files a/entitymanager/lib/build/ant-junit-1.6.5.jar and /dev/null differ
diff --git a/entitymanager/lib/build/junit-3.8.1.jar b/entitymanager/lib/build/junit-3.8.1.jar
deleted file mode 100644
index 674d71e89e..0000000000
Binary files a/entitymanager/lib/build/junit-3.8.1.jar and /dev/null differ
diff --git a/entitymanager/doc/api/jdstyle.css b/entitymanager/src/main/javadoc/jdstyle.css
similarity index 100%
rename from entitymanager/doc/api/jdstyle.css
rename to entitymanager/src/main/javadoc/jdstyle.css
diff --git a/entitymanager/doc/api/package.html b/entitymanager/src/main/javadoc/package.html
similarity index 100%
rename from entitymanager/doc/api/package.html
rename to entitymanager/src/main/javadoc/package.html