diff --git a/dspace/lib/PDFBox.jar b/dspace-api/lib/PDFBox.jar
similarity index 100%
rename from dspace/lib/PDFBox.jar
rename to dspace-api/lib/PDFBox.jar
diff --git a/dspace/lib/README b/dspace-api/lib/README
similarity index 100%
rename from dspace/lib/README
rename to dspace-api/lib/README
diff --git a/dspace/lib/activation.jar b/dspace-api/lib/activation.jar
similarity index 100%
rename from dspace/lib/activation.jar
rename to dspace-api/lib/activation.jar
diff --git a/dspace/lib/bcmail-jdk15-136.jar b/dspace-api/lib/bcmail-jdk15-136.jar
similarity index 100%
rename from dspace/lib/bcmail-jdk15-136.jar
rename to dspace-api/lib/bcmail-jdk15-136.jar
diff --git a/dspace/lib/bcprov-jdk15-136.jar b/dspace-api/lib/bcprov-jdk15-136.jar
similarity index 100%
rename from dspace/lib/bcprov-jdk15-136.jar
rename to dspace-api/lib/bcprov-jdk15-136.jar
diff --git a/dspace/lib/commons-cli.jar b/dspace-api/lib/commons-cli.jar
similarity index 100%
rename from dspace/lib/commons-cli.jar
rename to dspace-api/lib/commons-cli.jar
diff --git a/dspace/lib/commons-codec-1.3.jar b/dspace-api/lib/commons-codec-1.3.jar
similarity index 100%
rename from dspace/lib/commons-codec-1.3.jar
rename to dspace-api/lib/commons-codec-1.3.jar
diff --git a/dspace/lib/commons-collections.jar b/dspace-api/lib/commons-collections.jar
similarity index 100%
rename from dspace/lib/commons-collections.jar
rename to dspace-api/lib/commons-collections.jar
diff --git a/dspace/lib/commons-dbcp.jar b/dspace-api/lib/commons-dbcp.jar
similarity index 100%
rename from dspace/lib/commons-dbcp.jar
rename to dspace-api/lib/commons-dbcp.jar
diff --git a/dspace/lib/commons-fileupload.jar b/dspace-api/lib/commons-fileupload.jar
similarity index 100%
rename from dspace/lib/commons-fileupload.jar
rename to dspace-api/lib/commons-fileupload.jar
diff --git a/dspace/lib/commons-io.jar b/dspace-api/lib/commons-io.jar
similarity index 100%
rename from dspace/lib/commons-io.jar
rename to dspace-api/lib/commons-io.jar
diff --git a/dspace/lib/commons-lang-2.1.jar b/dspace-api/lib/commons-lang-2.1.jar
similarity index 100%
rename from dspace/lib/commons-lang-2.1.jar
rename to dspace-api/lib/commons-lang-2.1.jar
diff --git a/dspace/lib/commons-pool.jar b/dspace-api/lib/commons-pool.jar
similarity index 100%
rename from dspace/lib/commons-pool.jar
rename to dspace-api/lib/commons-pool.jar
diff --git a/dspace/lib/fontbox.jar b/dspace-api/lib/fontbox.jar
similarity index 100%
rename from dspace/lib/fontbox.jar
rename to dspace-api/lib/fontbox.jar
diff --git a/dspace/lib/handle.jar b/dspace-api/lib/handle.jar
similarity index 100%
rename from dspace/lib/handle.jar
rename to dspace-api/lib/handle.jar
diff --git a/dspace/lib/jakarta-poi.jar b/dspace-api/lib/jakarta-poi.jar
similarity index 100%
rename from dspace/lib/jakarta-poi.jar
rename to dspace-api/lib/jakarta-poi.jar
diff --git a/dspace/lib/jargon.jar b/dspace-api/lib/jargon.jar
similarity index 100%
rename from dspace/lib/jargon.jar
rename to dspace-api/lib/jargon.jar
diff --git a/dspace/lib/jaxen.jar b/dspace-api/lib/jaxen.jar
similarity index 100%
rename from dspace/lib/jaxen.jar
rename to dspace-api/lib/jaxen.jar
diff --git a/dspace/lib/jdom.jar b/dspace-api/lib/jdom.jar
similarity index 100%
rename from dspace/lib/jdom.jar
rename to dspace-api/lib/jdom.jar
diff --git a/dspace/lib/jena.jar b/dspace-api/lib/jena.jar
similarity index 100%
rename from dspace/lib/jena.jar
rename to dspace-api/lib/jena.jar
diff --git a/dspace/lib/licenses/activation.jar.license b/dspace-api/lib/licenses/activation.jar.license
similarity index 100%
rename from dspace/lib/licenses/activation.jar.license
rename to dspace-api/lib/licenses/activation.jar.license
diff --git a/dspace/lib/licenses/activation.jar.license.distribution-addendum b/dspace-api/lib/licenses/activation.jar.license.distribution-addendum
similarity index 100%
rename from dspace/lib/licenses/activation.jar.license.distribution-addendum
rename to dspace-api/lib/licenses/activation.jar.license.distribution-addendum
diff --git a/dspace/lib/licenses/bcmail-jdk14-135.jar.license b/dspace-api/lib/licenses/bcmail-jdk14-135.jar.license
similarity index 100%
rename from dspace/lib/licenses/bcmail-jdk14-135.jar.license
rename to dspace-api/lib/licenses/bcmail-jdk14-135.jar.license
diff --git a/dspace/lib/licenses/bcprov-jdk14-135.jar.license b/dspace-api/lib/licenses/bcprov-jdk14-135.jar.license
similarity index 100%
rename from dspace/lib/licenses/bcprov-jdk14-135.jar.license
rename to dspace-api/lib/licenses/bcprov-jdk14-135.jar.license
diff --git a/dspace/lib/licenses/commons-cli.jar.license b/dspace-api/lib/licenses/commons-cli.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-cli.jar.license
rename to dspace-api/lib/licenses/commons-cli.jar.license
diff --git a/dspace/lib/licenses/commons-collections.jar.license b/dspace-api/lib/licenses/commons-collections.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-collections.jar.license
rename to dspace-api/lib/licenses/commons-collections.jar.license
diff --git a/dspace/lib/licenses/commons-dbcp.jar.license b/dspace-api/lib/licenses/commons-dbcp.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-dbcp.jar.license
rename to dspace-api/lib/licenses/commons-dbcp.jar.license
diff --git a/dspace/lib/licenses/commons-fileupload.jar.license b/dspace-api/lib/licenses/commons-fileupload.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-fileupload.jar.license
rename to dspace-api/lib/licenses/commons-fileupload.jar.license
diff --git a/dspace/lib/licenses/commons-io.jar.license b/dspace-api/lib/licenses/commons-io.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-io.jar.license
rename to dspace-api/lib/licenses/commons-io.jar.license
diff --git a/dspace/lib/licenses/commons-lang-2.1.jar.license b/dspace-api/lib/licenses/commons-lang-2.1.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-lang-2.1.jar.license
rename to dspace-api/lib/licenses/commons-lang-2.1.jar.license
diff --git a/dspace/lib/licenses/commons-pool.jar.license b/dspace-api/lib/licenses/commons-pool.jar.license
similarity index 100%
rename from dspace/lib/licenses/commons-pool.jar.license
rename to dspace-api/lib/licenses/commons-pool.jar.license
diff --git a/dspace/lib/licenses/fontbox.jar.license b/dspace-api/lib/licenses/fontbox.jar.license
similarity index 100%
rename from dspace/lib/licenses/fontbox.jar.license
rename to dspace-api/lib/licenses/fontbox.jar.license
diff --git a/dspace/lib/licenses/handle.jar.license b/dspace-api/lib/licenses/handle.jar.license
similarity index 100%
rename from dspace/lib/licenses/handle.jar.license
rename to dspace-api/lib/licenses/handle.jar.license
diff --git a/dspace/lib/licenses/jakarta-poi.jar.license b/dspace-api/lib/licenses/jakarta-poi.jar.license
similarity index 100%
rename from dspace/lib/licenses/jakarta-poi.jar.license
rename to dspace-api/lib/licenses/jakarta-poi.jar.license
diff --git a/dspace/lib/licenses/jargon.jar.license b/dspace-api/lib/licenses/jargon.jar.license
similarity index 100%
rename from dspace/lib/licenses/jargon.jar.license
rename to dspace-api/lib/licenses/jargon.jar.license
diff --git a/dspace/lib/licenses/javamail.jar.license b/dspace-api/lib/licenses/javamail.jar.license
similarity index 100%
rename from dspace/lib/licenses/javamail.jar.license
rename to dspace-api/lib/licenses/javamail.jar.license
diff --git a/dspace/lib/licenses/jaxen.jar.license b/dspace-api/lib/licenses/jaxen.jar.license
similarity index 100%
rename from dspace/lib/licenses/jaxen.jar.license
rename to dspace-api/lib/licenses/jaxen.jar.license
diff --git a/dspace/lib/licenses/jdom.jar.license b/dspace-api/lib/licenses/jdom.jar.license
similarity index 100%
rename from dspace/lib/licenses/jdom.jar.license
rename to dspace-api/lib/licenses/jdom.jar.license
diff --git a/dspace/lib/licenses/jena.jar.license b/dspace-api/lib/licenses/jena.jar.license
similarity index 100%
rename from dspace/lib/licenses/jena.jar.license
rename to dspace-api/lib/licenses/jena.jar.license
diff --git a/dspace/lib/licenses/log4j.jar.license b/dspace-api/lib/licenses/log4j.jar.license
similarity index 100%
rename from dspace/lib/licenses/log4j.jar.license
rename to dspace-api/lib/licenses/log4j.jar.license
diff --git a/dspace/lib/licenses/lucene-sandbox.jar.license b/dspace-api/lib/licenses/lucene-sandbox.jar.license
similarity index 100%
rename from dspace/lib/licenses/lucene-sandbox.jar.license
rename to dspace-api/lib/licenses/lucene-sandbox.jar.license
diff --git a/dspace/lib/licenses/lucene.jar.license b/dspace-api/lib/licenses/lucene.jar.license
similarity index 100%
rename from dspace/lib/licenses/lucene.jar.license
rename to dspace-api/lib/licenses/lucene.jar.license
diff --git a/dspace/lib/licenses/mail.jar.license b/dspace-api/lib/licenses/mail.jar.license
similarity index 100%
rename from dspace/lib/licenses/mail.jar.license
rename to dspace-api/lib/licenses/mail.jar.license
diff --git a/dspace/lib/licenses/mail.jar.license.distribution-addendum b/dspace-api/lib/licenses/mail.jar.license.distribution-addendum
similarity index 100%
rename from dspace/lib/licenses/mail.jar.license.distribution-addendum
rename to dspace-api/lib/licenses/mail.jar.license.distribution-addendum
diff --git a/dspace/lib/licenses/mets.jar.license b/dspace-api/lib/licenses/mets.jar.license
similarity index 100%
rename from dspace/lib/licenses/mets.jar.license
rename to dspace-api/lib/licenses/mets.jar.license
diff --git a/dspace/lib/licenses/oro.jar.license b/dspace-api/lib/licenses/oro.jar.license
similarity index 100%
rename from dspace/lib/licenses/oro.jar.license
rename to dspace-api/lib/licenses/oro.jar.license
diff --git a/dspace/lib/licenses/pdfbox.jar.license b/dspace-api/lib/licenses/pdfbox.jar.license
similarity index 100%
rename from dspace/lib/licenses/pdfbox.jar.license
rename to dspace-api/lib/licenses/pdfbox.jar.license
diff --git a/dspace/lib/licenses/rome.jar.license b/dspace-api/lib/licenses/rome.jar.license
similarity index 100%
rename from dspace/lib/licenses/rome.jar.license
rename to dspace-api/lib/licenses/rome.jar.license
diff --git a/dspace/lib/licenses/serializer.jar.license b/dspace-api/lib/licenses/serializer.jar.license
similarity index 100%
rename from dspace/lib/licenses/serializer.jar.license
rename to dspace-api/lib/licenses/serializer.jar.license
diff --git a/dspace/lib/licenses/servlet.jar.license b/dspace-api/lib/licenses/servlet.jar.license
similarity index 100%
rename from dspace/lib/licenses/servlet.jar.license
rename to dspace-api/lib/licenses/servlet.jar.license
diff --git a/dspace/lib/licenses/tm-extractors.jar.license b/dspace-api/lib/licenses/tm-extractors.jar.license
similarity index 100%
rename from dspace/lib/licenses/tm-extractors.jar.license
rename to dspace-api/lib/licenses/tm-extractors.jar.license
diff --git a/dspace/lib/licenses/xalan.jar.license b/dspace-api/lib/licenses/xalan.jar.license
similarity index 100%
rename from dspace/lib/licenses/xalan.jar.license
rename to dspace-api/lib/licenses/xalan.jar.license
diff --git a/dspace/lib/licenses/xercesImpl.jar.license b/dspace-api/lib/licenses/xercesImpl.jar.license
similarity index 100%
rename from dspace/lib/licenses/xercesImpl.jar.license
rename to dspace-api/lib/licenses/xercesImpl.jar.license
diff --git a/dspace/lib/licenses/xml-apis.jar.dom.license b/dspace-api/lib/licenses/xml-apis.jar.dom.license
similarity index 100%
rename from dspace/lib/licenses/xml-apis.jar.dom.license
rename to dspace-api/lib/licenses/xml-apis.jar.dom.license
diff --git a/dspace/lib/licenses/xml-apis.jar.sax.license b/dspace-api/lib/licenses/xml-apis.jar.sax.license
similarity index 100%
rename from dspace/lib/licenses/xml-apis.jar.sax.license
rename to dspace-api/lib/licenses/xml-apis.jar.sax.license
diff --git a/dspace/lib/log4j.jar b/dspace-api/lib/log4j.jar
similarity index 100%
rename from dspace/lib/log4j.jar
rename to dspace-api/lib/log4j.jar
diff --git a/dspace/lib/lucene.jar b/dspace-api/lib/lucene.jar
similarity index 100%
rename from dspace/lib/lucene.jar
rename to dspace-api/lib/lucene.jar
diff --git a/dspace/lib/mail.jar b/dspace-api/lib/mail.jar
similarity index 100%
rename from dspace/lib/mail.jar
rename to dspace-api/lib/mail.jar
diff --git a/dspace/lib/mets.jar b/dspace-api/lib/mets.jar
similarity index 100%
rename from dspace/lib/mets.jar
rename to dspace-api/lib/mets.jar
diff --git a/dspace/lib/oro.jar b/dspace-api/lib/oro.jar
similarity index 100%
rename from dspace/lib/oro.jar
rename to dspace-api/lib/oro.jar
diff --git a/dspace/lib/rome.jar b/dspace-api/lib/rome.jar
similarity index 100%
rename from dspace/lib/rome.jar
rename to dspace-api/lib/rome.jar
diff --git a/dspace/lib/serializer.jar b/dspace-api/lib/serializer.jar
similarity index 100%
rename from dspace/lib/serializer.jar
rename to dspace-api/lib/serializer.jar
diff --git a/dspace/lib/servlet.jar b/dspace-api/lib/servlet.jar
similarity index 100%
rename from dspace/lib/servlet.jar
rename to dspace-api/lib/servlet.jar
diff --git a/dspace/lib/tm-extractors.jar b/dspace-api/lib/tm-extractors.jar
similarity index 100%
rename from dspace/lib/tm-extractors.jar
rename to dspace-api/lib/tm-extractors.jar
diff --git a/dspace/lib/xalan.jar b/dspace-api/lib/xalan.jar
similarity index 100%
rename from dspace/lib/xalan.jar
rename to dspace-api/lib/xalan.jar
diff --git a/dspace/lib/xercesImpl.jar b/dspace-api/lib/xercesImpl.jar
similarity index 100%
rename from dspace/lib/xercesImpl.jar
rename to dspace-api/lib/xercesImpl.jar
diff --git a/dspace/lib/xml-apis.jar b/dspace-api/lib/xml-apis.jar
similarity index 100%
rename from dspace/lib/xml-apis.jar
rename to dspace-api/lib/xml-apis.jar