diff --git a/.gitignore b/.gitignore
index 460b0473..ad444b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,8 @@ rdf/auth/firsttime/test-user-model.owl
 utilities/solrtester/.work
 utilities/rdbmigration/.work
 
+**/.idea
 **/*.iml
+**/target
+
+**/overlays
diff --git a/api/pom.xml b/api/pom.xml
new file mode 100644
index 00000000..617485b9
--- /dev/null
+++ b/api/pom.xml
@@ -0,0 +1,132 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo-api</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-project</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO API</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.2</version>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>org.vivoweb:vitro-api</include>
+                        </includes>
+                    </artifactSet>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <!-- promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <shadedClassifierName>shaded</shadedClassifierName>
+                    <useBaseVersion>true</useBaseVersion -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-dependencies</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>2.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>2.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.vivoweb.dependencies</groupId>
+            <artifactId>agrovocws</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb.dependencies</groupId>
+            <artifactId>oim.vivo.scimapcore</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb.dependencies</groupId>
+            <artifactId>orcid-api-client</artifactId>
+            <version>0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-api</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/edu/cornell/mannlib/semservices/bo/BaseObject.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/BaseObject.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/bo/BaseObject.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/bo/BaseObject.java
diff --git a/src/edu/cornell/mannlib/semservices/bo/Concept.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/bo/Concept.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java
diff --git a/src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/ConceptInfo.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/bo/ConceptInfo.java
diff --git a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java
diff --git a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java
diff --git a/src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java b/api/src/main/java/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java
diff --git a/src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/ExternalConceptService.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/service/ExternalConceptService.java
diff --git a/src/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
diff --git a/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/service/impl/GemetService.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java
diff --git a/src/edu/cornell/mannlib/semservices/service/impl/LCSHService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java
diff --git a/src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java
diff --git a/src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java
diff --git a/src/edu/cornell/mannlib/semservices/util/SKOSUtils.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/util/SKOSUtils.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
diff --git a/src/edu/cornell/mannlib/semservices/util/XMLUtils.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/semservices/util/XMLUtils.java
rename to api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestJob.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/AutocompleteRequiredInputValidator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/FirstAndLastNameValidator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddTeacherRoleToPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdviseeRelationshipGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ConceptSemanticTypesPreprocessor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/VocabSourceDescription.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/InternalClassesDataGetter.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/MapOfScienceConstants.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VOConstants.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/DocumentFieldNotFoundException.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/IllegalConstructedModelIdentifierException.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/exceptions/MalformedQueryParametersException.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CachingRDFServiceExecutor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/CounterUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/PersonPublicationMaps.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModel.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CollaborationDataViewHelper.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CustomLock.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
similarity index 100%
rename from src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java b/api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicy.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidContextSetup.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/OrcidIdDataGetter.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAbstractHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthAuthenticateHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAuthExternalIdsHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidCallbackHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidDefaultHandler.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIllegalStateException.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java
diff --git a/src/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java
similarity index 100%
rename from src/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java
rename to api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java
diff --git a/src/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
similarity index 100%
rename from src/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
rename to api/src/main/java/org/vivoweb/reasoner/plugin/DCCreatorForDocuments.java
diff --git a/src/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
similarity index 100%
rename from src/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
rename to api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java
diff --git a/src/org/vivoweb/webapp/util/ModelUtils.java b/api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java
similarity index 100%
rename from src/org/vivoweb/webapp/util/ModelUtils.java
rename to api/src/main/java/org/vivoweb/webapp/util/ModelUtils.java
diff --git a/test/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
similarity index 100%
rename from test/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
rename to api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodesTest.java
diff --git a/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
similarity index 100%
rename from test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
rename to api/src/test/java/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java
diff --git a/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
similarity index 100%
rename from test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
rename to api/src/test/resources/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.n3
diff --git a/test/log4j.properties b/api/src/test/resources/log4j.properties
similarity index 100%
rename from test/log4j.properties
rename to api/src/test/resources/log4j.properties
diff --git a/home/pom.xml b/home/pom.xml
new file mode 100644
index 00000000..ba4c3c4a
--- /dev/null
+++ b/home/pom.xml
@@ -0,0 +1,77 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo-home</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-project</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO Home</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.5</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/home.xml</descriptor>
+                    </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>target/${project.artifactId}-${project.version}.tar.gz</file>
+                                    <type>tar.gz</type>
+                                    <!-- classifier>optional</classifier -->
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-home</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>tar.gz</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/home/src/main/assembly/home.xml b/home/src/main/assembly/home.xml
new file mode 100644
index 00000000..ab7f29fd
--- /dev/null
+++ b/home/src/main/assembly/home.xml
@@ -0,0 +1,30 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>home</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <unpack>true</unpack>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3
similarity index 100%
rename from config/example.applicationSetup.n3
rename to home/src/main/resources/config/example.applicationSetup.n3
diff --git a/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties
similarity index 100%
rename from config/example.runtime.properties
rename to home/src/main/resources/config/example.runtime.properties
diff --git a/rdf/abox/filegraph/README.md b/home/src/main/resources/rdf/abox/filegraph/README.md
similarity index 100%
rename from rdf/abox/filegraph/README.md
rename to home/src/main/resources/rdf/abox/filegraph/README.md
diff --git a/rdf/abox/filegraph/academicDegree.rdf b/home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf
similarity index 100%
rename from rdf/abox/filegraph/academicDegree.rdf
rename to home/src/main/resources/rdf/abox/filegraph/academicDegree.rdf
diff --git a/rdf/abox/filegraph/continents.n3 b/home/src/main/resources/rdf/abox/filegraph/continents.n3
similarity index 100%
rename from rdf/abox/filegraph/continents.n3
rename to home/src/main/resources/rdf/abox/filegraph/continents.n3
diff --git a/rdf/abox/filegraph/dateTimeValuePrecision.owl b/home/src/main/resources/rdf/abox/filegraph/dateTimeValuePrecision.owl
similarity index 100%
rename from rdf/abox/filegraph/dateTimeValuePrecision.owl
rename to home/src/main/resources/rdf/abox/filegraph/dateTimeValuePrecision.owl
diff --git a/rdf/abox/filegraph/documentStatus.owl b/home/src/main/resources/rdf/abox/filegraph/documentStatus.owl
similarity index 100%
rename from rdf/abox/filegraph/documentStatus.owl
rename to home/src/main/resources/rdf/abox/filegraph/documentStatus.owl
diff --git a/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl b/home/src/main/resources/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl
similarity index 100%
rename from rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl
rename to home/src/main/resources/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl
diff --git a/rdf/abox/filegraph/us-states.rdf b/home/src/main/resources/rdf/abox/filegraph/us-states.rdf
similarity index 100%
rename from rdf/abox/filegraph/us-states.rdf
rename to home/src/main/resources/rdf/abox/filegraph/us-states.rdf
diff --git a/rdf/abox/filegraph/validation.n3 b/home/src/main/resources/rdf/abox/filegraph/validation.n3
similarity index 100%
rename from rdf/abox/filegraph/validation.n3
rename to home/src/main/resources/rdf/abox/filegraph/validation.n3
diff --git a/rdf/abox/filegraph/vocabularySource.n3 b/home/src/main/resources/rdf/abox/filegraph/vocabularySource.n3
similarity index 100%
rename from rdf/abox/filegraph/vocabularySource.n3
rename to home/src/main/resources/rdf/abox/filegraph/vocabularySource.n3
diff --git a/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf b/home/src/main/resources/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
similarity index 100%
rename from rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
rename to home/src/main/resources/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
diff --git a/rdf/applicationMetadata/firsttime/classgroups.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf
similarity index 100%
rename from rdf/applicationMetadata/firsttime/classgroups.rdf
rename to home/src/main/resources/rdf/applicationMetadata/firsttime/classgroups.rdf
diff --git a/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
similarity index 100%
rename from rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
rename to home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
diff --git a/rdf/applicationMetadata/firsttime/propertygroups.rdf b/home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf
similarity index 100%
rename from rdf/applicationMetadata/firsttime/propertygroups.rdf
rename to home/src/main/resources/rdf/applicationMetadata/firsttime/propertygroups.rdf
diff --git a/rdf/display/everytime/homePageDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3
similarity index 100%
rename from rdf/display/everytime/homePageDataGetters.n3
rename to home/src/main/resources/rdf/display/everytime/homePageDataGetters.n3
diff --git a/rdf/display/everytime/localeSelectionGUI.n3 b/home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3
similarity index 100%
rename from rdf/display/everytime/localeSelectionGUI.n3
rename to home/src/main/resources/rdf/display/everytime/localeSelectionGUI.n3
diff --git a/rdf/display/everytime/n3ModelChangePreprocessors.n3 b/home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3
similarity index 100%
rename from rdf/display/everytime/n3ModelChangePreprocessors.n3
rename to home/src/main/resources/rdf/display/everytime/n3ModelChangePreprocessors.n3
diff --git a/rdf/display/everytime/orcidInterfaceDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3
similarity index 100%
rename from rdf/display/everytime/orcidInterfaceDataGetters.n3
rename to home/src/main/resources/rdf/display/everytime/orcidInterfaceDataGetters.n3
diff --git a/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
similarity index 100%
rename from rdf/display/everytime/searchIndexerConfigurationVivo.n3
rename to home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3
diff --git a/rdf/display/everytime/vivoConceptDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3
similarity index 100%
rename from rdf/display/everytime/vivoConceptDataGetters.n3
rename to home/src/main/resources/rdf/display/everytime/vivoConceptDataGetters.n3
diff --git a/rdf/display/everytime/vivoListViewConfig.rdf b/home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf
similarity index 100%
rename from rdf/display/everytime/vivoListViewConfig.rdf
rename to home/src/main/resources/rdf/display/everytime/vivoListViewConfig.rdf
diff --git a/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3
similarity index 100%
rename from rdf/display/everytime/vivoOrganizationDataGetters.n3
rename to home/src/main/resources/rdf/display/everytime/vivoOrganizationDataGetters.n3
diff --git a/rdf/display/everytime/vivoQrCodeDataGetter.n3 b/home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3
similarity index 100%
rename from rdf/display/everytime/vivoQrCodeDataGetter.n3
rename to home/src/main/resources/rdf/display/everytime/vivoQrCodeDataGetter.n3
diff --git a/rdf/display/everytime/vivoSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3
similarity index 100%
rename from rdf/display/everytime/vivoSearchProhibited.n3
rename to home/src/main/resources/rdf/display/everytime/vivoSearchProhibited.n3
diff --git a/rdf/display/firsttime/PropertyConfig.n3 b/home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3
similarity index 100%
rename from rdf/display/firsttime/PropertyConfig.n3
rename to home/src/main/resources/rdf/display/firsttime/PropertyConfig.n3
diff --git a/rdf/display/firsttime/PropertyConfigSupp.n3 b/home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3
similarity index 100%
rename from rdf/display/firsttime/PropertyConfigSupp.n3
rename to home/src/main/resources/rdf/display/firsttime/PropertyConfigSupp.n3
diff --git a/rdf/display/firsttime/aboutPage.n3 b/home/src/main/resources/rdf/display/firsttime/aboutPage.n3
similarity index 100%
rename from rdf/display/firsttime/aboutPage.n3
rename to home/src/main/resources/rdf/display/firsttime/aboutPage.n3
diff --git a/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3
similarity index 100%
rename from rdf/display/firsttime/menu.n3
rename to home/src/main/resources/rdf/display/firsttime/menu.n3
diff --git a/rdf/tbox/filegraph/README.md b/home/src/main/resources/rdf/tbox/filegraph/README.md
similarity index 100%
rename from rdf/tbox/filegraph/README.md
rename to home/src/main/resources/rdf/tbox/filegraph/README.md
diff --git a/rdf/tbox/filegraph/agent.owl b/home/src/main/resources/rdf/tbox/filegraph/agent.owl
similarity index 100%
rename from rdf/tbox/filegraph/agent.owl
rename to home/src/main/resources/rdf/tbox/filegraph/agent.owl
diff --git a/rdf/tbox/filegraph/appControls-temp.n3 b/home/src/main/resources/rdf/tbox/filegraph/appControls-temp.n3
similarity index 100%
rename from rdf/tbox/filegraph/appControls-temp.n3
rename to home/src/main/resources/rdf/tbox/filegraph/appControls-temp.n3
diff --git a/rdf/tbox/filegraph/bfo-bridge.owl b/home/src/main/resources/rdf/tbox/filegraph/bfo-bridge.owl
similarity index 100%
rename from rdf/tbox/filegraph/bfo-bridge.owl
rename to home/src/main/resources/rdf/tbox/filegraph/bfo-bridge.owl
diff --git a/rdf/tbox/filegraph/bfo.owl b/home/src/main/resources/rdf/tbox/filegraph/bfo.owl
similarity index 100%
rename from rdf/tbox/filegraph/bfo.owl
rename to home/src/main/resources/rdf/tbox/filegraph/bfo.owl
diff --git a/rdf/tbox/filegraph/classes-additional.owl b/home/src/main/resources/rdf/tbox/filegraph/classes-additional.owl
similarity index 100%
rename from rdf/tbox/filegraph/classes-additional.owl
rename to home/src/main/resources/rdf/tbox/filegraph/classes-additional.owl
diff --git a/rdf/tbox/filegraph/clinical.owl b/home/src/main/resources/rdf/tbox/filegraph/clinical.owl
similarity index 100%
rename from rdf/tbox/filegraph/clinical.owl
rename to home/src/main/resources/rdf/tbox/filegraph/clinical.owl
diff --git a/rdf/tbox/filegraph/contact-vcard.owl b/home/src/main/resources/rdf/tbox/filegraph/contact-vcard.owl
similarity index 100%
rename from rdf/tbox/filegraph/contact-vcard.owl
rename to home/src/main/resources/rdf/tbox/filegraph/contact-vcard.owl
diff --git a/rdf/tbox/filegraph/contact.owl b/home/src/main/resources/rdf/tbox/filegraph/contact.owl
similarity index 100%
rename from rdf/tbox/filegraph/contact.owl
rename to home/src/main/resources/rdf/tbox/filegraph/contact.owl
diff --git a/rdf/tbox/filegraph/data-properties.owl b/home/src/main/resources/rdf/tbox/filegraph/data-properties.owl
similarity index 100%
rename from rdf/tbox/filegraph/data-properties.owl
rename to home/src/main/resources/rdf/tbox/filegraph/data-properties.owl
diff --git a/rdf/tbox/filegraph/dataDomains.rdf b/home/src/main/resources/rdf/tbox/filegraph/dataDomains.rdf
similarity index 100%
rename from rdf/tbox/filegraph/dataDomains.rdf
rename to home/src/main/resources/rdf/tbox/filegraph/dataDomains.rdf
diff --git a/rdf/tbox/filegraph/dataset.owl b/home/src/main/resources/rdf/tbox/filegraph/dataset.owl
similarity index 100%
rename from rdf/tbox/filegraph/dataset.owl
rename to home/src/main/resources/rdf/tbox/filegraph/dataset.owl
diff --git a/rdf/tbox/filegraph/date-time.owl b/home/src/main/resources/rdf/tbox/filegraph/date-time.owl
similarity index 100%
rename from rdf/tbox/filegraph/date-time.owl
rename to home/src/main/resources/rdf/tbox/filegraph/date-time.owl
diff --git a/rdf/tbox/filegraph/dateTimeValuePrecision.owl b/home/src/main/resources/rdf/tbox/filegraph/dateTimeValuePrecision.owl
similarity index 100%
rename from rdf/tbox/filegraph/dateTimeValuePrecision.owl
rename to home/src/main/resources/rdf/tbox/filegraph/dateTimeValuePrecision.owl
diff --git a/rdf/tbox/filegraph/documentStatus.owl b/home/src/main/resources/rdf/tbox/filegraph/documentStatus.owl
similarity index 100%
rename from rdf/tbox/filegraph/documentStatus.owl
rename to home/src/main/resources/rdf/tbox/filegraph/documentStatus.owl
diff --git a/rdf/tbox/filegraph/education.owl b/home/src/main/resources/rdf/tbox/filegraph/education.owl
similarity index 100%
rename from rdf/tbox/filegraph/education.owl
rename to home/src/main/resources/rdf/tbox/filegraph/education.owl
diff --git a/rdf/tbox/filegraph/event.owl b/home/src/main/resources/rdf/tbox/filegraph/event.owl
similarity index 100%
rename from rdf/tbox/filegraph/event.owl
rename to home/src/main/resources/rdf/tbox/filegraph/event.owl
diff --git a/rdf/tbox/filegraph/geo-political.owl b/home/src/main/resources/rdf/tbox/filegraph/geo-political.owl
similarity index 100%
rename from rdf/tbox/filegraph/geo-political.owl
rename to home/src/main/resources/rdf/tbox/filegraph/geo-political.owl
diff --git a/rdf/tbox/filegraph/grant.owl b/home/src/main/resources/rdf/tbox/filegraph/grant.owl
similarity index 100%
rename from rdf/tbox/filegraph/grant.owl
rename to home/src/main/resources/rdf/tbox/filegraph/grant.owl
diff --git a/rdf/tbox/filegraph/linkSuppression.n3 b/home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3
similarity index 100%
rename from rdf/tbox/filegraph/linkSuppression.n3
rename to home/src/main/resources/rdf/tbox/filegraph/linkSuppression.n3
diff --git a/rdf/tbox/filegraph/location.owl b/home/src/main/resources/rdf/tbox/filegraph/location.owl
similarity index 100%
rename from rdf/tbox/filegraph/location.owl
rename to home/src/main/resources/rdf/tbox/filegraph/location.owl
diff --git a/rdf/tbox/filegraph/object-properties.owl b/home/src/main/resources/rdf/tbox/filegraph/object-properties.owl
similarity index 100%
rename from rdf/tbox/filegraph/object-properties.owl
rename to home/src/main/resources/rdf/tbox/filegraph/object-properties.owl
diff --git a/rdf/tbox/filegraph/object-properties2.owl b/home/src/main/resources/rdf/tbox/filegraph/object-properties2.owl
similarity index 100%
rename from rdf/tbox/filegraph/object-properties2.owl
rename to home/src/main/resources/rdf/tbox/filegraph/object-properties2.owl
diff --git a/rdf/tbox/filegraph/object-properties3.owl b/home/src/main/resources/rdf/tbox/filegraph/object-properties3.owl
similarity index 100%
rename from rdf/tbox/filegraph/object-properties3.owl
rename to home/src/main/resources/rdf/tbox/filegraph/object-properties3.owl
diff --git a/rdf/tbox/filegraph/objectDomains.rdf b/home/src/main/resources/rdf/tbox/filegraph/objectDomains.rdf
similarity index 100%
rename from rdf/tbox/filegraph/objectDomains.rdf
rename to home/src/main/resources/rdf/tbox/filegraph/objectDomains.rdf
diff --git a/rdf/tbox/filegraph/objectRanges.rdf b/home/src/main/resources/rdf/tbox/filegraph/objectRanges.rdf
similarity index 100%
rename from rdf/tbox/filegraph/objectRanges.rdf
rename to home/src/main/resources/rdf/tbox/filegraph/objectRanges.rdf
diff --git a/rdf/tbox/filegraph/ontologies.owl b/home/src/main/resources/rdf/tbox/filegraph/ontologies.owl
similarity index 100%
rename from rdf/tbox/filegraph/ontologies.owl
rename to home/src/main/resources/rdf/tbox/filegraph/ontologies.owl
diff --git a/rdf/tbox/filegraph/orcid-interface.n3 b/home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3
similarity index 100%
rename from rdf/tbox/filegraph/orcid-interface.n3
rename to home/src/main/resources/rdf/tbox/filegraph/orcid-interface.n3
diff --git a/rdf/tbox/filegraph/other.owl b/home/src/main/resources/rdf/tbox/filegraph/other.owl
similarity index 100%
rename from rdf/tbox/filegraph/other.owl
rename to home/src/main/resources/rdf/tbox/filegraph/other.owl
diff --git a/rdf/tbox/filegraph/outreach.owl b/home/src/main/resources/rdf/tbox/filegraph/outreach.owl
similarity index 100%
rename from rdf/tbox/filegraph/outreach.owl
rename to home/src/main/resources/rdf/tbox/filegraph/outreach.owl
diff --git a/rdf/tbox/filegraph/personTypes.n3 b/home/src/main/resources/rdf/tbox/filegraph/personTypes.n3
similarity index 100%
rename from rdf/tbox/filegraph/personTypes.n3
rename to home/src/main/resources/rdf/tbox/filegraph/personTypes.n3
diff --git a/rdf/tbox/filegraph/process.owl b/home/src/main/resources/rdf/tbox/filegraph/process.owl
similarity index 100%
rename from rdf/tbox/filegraph/process.owl
rename to home/src/main/resources/rdf/tbox/filegraph/process.owl
diff --git a/rdf/tbox/filegraph/publication.owl b/home/src/main/resources/rdf/tbox/filegraph/publication.owl
similarity index 100%
rename from rdf/tbox/filegraph/publication.owl
rename to home/src/main/resources/rdf/tbox/filegraph/publication.owl
diff --git a/rdf/tbox/filegraph/relationship.owl b/home/src/main/resources/rdf/tbox/filegraph/relationship.owl
similarity index 100%
rename from rdf/tbox/filegraph/relationship.owl
rename to home/src/main/resources/rdf/tbox/filegraph/relationship.owl
diff --git a/rdf/tbox/filegraph/relationshipAxioms.n3 b/home/src/main/resources/rdf/tbox/filegraph/relationshipAxioms.n3
similarity index 100%
rename from rdf/tbox/filegraph/relationshipAxioms.n3
rename to home/src/main/resources/rdf/tbox/filegraph/relationshipAxioms.n3
diff --git a/rdf/tbox/filegraph/research-resource-iao.owl b/home/src/main/resources/rdf/tbox/filegraph/research-resource-iao.owl
similarity index 100%
rename from rdf/tbox/filegraph/research-resource-iao.owl
rename to home/src/main/resources/rdf/tbox/filegraph/research-resource-iao.owl
diff --git a/rdf/tbox/filegraph/research-resource.owl b/home/src/main/resources/rdf/tbox/filegraph/research-resource.owl
similarity index 100%
rename from rdf/tbox/filegraph/research-resource.owl
rename to home/src/main/resources/rdf/tbox/filegraph/research-resource.owl
diff --git a/rdf/tbox/filegraph/research.owl b/home/src/main/resources/rdf/tbox/filegraph/research.owl
similarity index 100%
rename from rdf/tbox/filegraph/research.owl
rename to home/src/main/resources/rdf/tbox/filegraph/research.owl
diff --git a/rdf/tbox/filegraph/role.owl b/home/src/main/resources/rdf/tbox/filegraph/role.owl
similarity index 100%
rename from rdf/tbox/filegraph/role.owl
rename to home/src/main/resources/rdf/tbox/filegraph/role.owl
diff --git a/rdf/tbox/filegraph/sameAs.n3 b/home/src/main/resources/rdf/tbox/filegraph/sameAs.n3
similarity index 100%
rename from rdf/tbox/filegraph/sameAs.n3
rename to home/src/main/resources/rdf/tbox/filegraph/sameAs.n3
diff --git a/rdf/tbox/filegraph/service.owl b/home/src/main/resources/rdf/tbox/filegraph/service.owl
similarity index 100%
rename from rdf/tbox/filegraph/service.owl
rename to home/src/main/resources/rdf/tbox/filegraph/service.owl
diff --git a/rdf/tbox/filegraph/skos-vivo.owl b/home/src/main/resources/rdf/tbox/filegraph/skos-vivo.owl
similarity index 100%
rename from rdf/tbox/filegraph/skos-vivo.owl
rename to home/src/main/resources/rdf/tbox/filegraph/skos-vivo.owl
diff --git a/rdf/tbox/filegraph/teaching.owl b/home/src/main/resources/rdf/tbox/filegraph/teaching.owl
similarity index 100%
rename from rdf/tbox/filegraph/teaching.owl
rename to home/src/main/resources/rdf/tbox/filegraph/teaching.owl
diff --git a/rdf/tbox/firsttime/README.md b/home/src/main/resources/rdf/tbox/firsttime/README.md
similarity index 100%
rename from rdf/tbox/firsttime/README.md
rename to home/src/main/resources/rdf/tbox/firsttime/README.md
diff --git a/productMods/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3 b/home/src/main/resources/rdf/tbox/firsttime/additionalHiding.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
rename to home/src/main/resources/rdf/tbox/firsttime/additionalHiding.n3
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/initialTBoxAnnotations.n3
similarity index 100%
rename from rdf/tbox/firsttime/initialTBoxAnnotations.n3
rename to home/src/main/resources/rdf/tbox/firsttime/initialTBoxAnnotations.n3
diff --git a/installer/default-settings.xml b/installer/default-settings.xml
new file mode 100644
index 00000000..0235418e
--- /dev/null
+++ b/installer/default-settings.xml
@@ -0,0 +1,21 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+
+    <profiles>
+        <profile>
+            <id>defaults</id>
+            <properties>
+                <app-name>vivo</app-name>
+
+                <vivo-dir>/usr/local/vivo/home</vivo-dir>
+                <tomcat-dir>/usr/local/tomcat</tomcat-dir>
+
+                <default-theme>wilma</default-theme>
+            </properties>
+        </profile>
+    </profiles>
+
+    <activeProfiles>
+        <activeProfile>defaults</activeProfile>
+    </activeProfiles>
+</settings>
\ No newline at end of file
diff --git a/installer/home/pom.xml b/installer/home/pom.xml
new file mode 100644
index 00000000..0761559e
--- /dev/null
+++ b/installer/home/pom.xml
@@ -0,0 +1,116 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>home</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-installer</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO Prepare Home</name>
+
+    <properties>
+        <default-theme>wilma</default-theme>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>install</id>
+            <activation>
+                <property><name>vivo-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.5.5</version>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/home.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>remove-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <delete dir="${vivo-dir}/rdf" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>2.7</version>
+                        <executions>
+                            <execution>
+                                <id>install</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${vivo-dir}</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.build.directory}/${project.build.finalName}</directory>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vivo-home</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>tar.gz</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml
new file mode 100644
index 00000000..97f6d936
--- /dev/null
+++ b/installer/home/src/main/assembly/home.xml
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>home</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <unpack>true</unpack>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
+            <filtered>true</filtered>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf b/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
new file mode 100644
index 00000000..f72b329c
--- /dev/null
+++ b/installer/home/src/main/resources/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+    xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+    <rdf:Description>
+        <rdf:type rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Portal"/>
+        <rdfs:label xml:lang="en-US">VIVO</rdfs:label>
+        <j.0:shortHand rdf:datatype="http://www.w3.org/2001/XMLSchema#string">enabling national networking of scientists</j.0:shortHand>
+        <j.0:flag1Filtering rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</j.0:flag1Filtering>
+        <j.0:imageThumbWidth rdf:datatype="http://www.w3.org/2001/XMLSchema#int">0</j.0:imageThumbWidth>
+        <j.0:logotypeHeight rdf:datatype="http://www.w3.org/2001/XMLSchema#int">0</j.0:logotypeHeight>
+        <j.0:bannerWidth rdf:datatype="http://www.w3.org/2001/XMLSchema#int">0</j.0:bannerWidth>
+        <j.0:rootTab rdf:nodeID="tab1"/>
+        <j.0:displayRank rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</j.0:displayRank>
+        <j.0:logotypeWidth rdf:datatype="http://www.w3.org/2001/XMLSchema#int">0</j.0:logotypeWidth>
+        <j.0:bannerHeight rdf:datatype="http://www.w3.org/2001/XMLSchema#int">0</j.0:bannerHeight>
+        <j.0:copyrightAnchor rdf:datatype="http://www.w3.org/2001/XMLSchema#string">VIVO Project</j.0:copyrightAnchor>
+        <j.0:aboutText rdf:datatype="http://www.w3.org/2001/XMLSchema#string">&lt;p&gt;VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with content at an institution, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually or brought into the database in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases.&lt;/p&gt;
+
+
+
+&lt;p&gt;See more information on the &lt;a href="http://vivoweb.org"&gt;VIVO Project&lt;/a&gt;.&lt;/p&gt;</j.0:aboutText>
+         <j.0:themeDir rdf:datatype="http://www.w3.org/2001/XMLSchema#string">themes/${default-theme}/</j.0:themeDir>
+      </rdf:Description>
+</rdf:RDF>
diff --git a/installer/pom.xml b/installer/pom.xml
new file mode 100644
index 00000000..62d9ee4b
--- /dev/null
+++ b/installer/pom.xml
@@ -0,0 +1,124 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo-installer</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>VIVO Installer</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>home</module>
+        <module>solr</module>
+        <module>webapp</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>skip-install</id>
+            <activation>
+                <property><name>!vivo-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.1</version>
+                        <executions>
+                            <execution>
+                                <id>default-compile</id>
+                                <phase />
+                            </execution>
+                            <execution>
+                                <id>default-testCompile</id>
+                                <phase />
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>2.6</version>
+                        <executions>
+                            <execution>
+                                <id>default-resources</id>
+                                <phase />
+                            </execution>
+                            <execution>
+                                <id>default-testResources</id>
+                                <phase />
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.12.4</version>
+                        <executions>
+                            <execution>
+                                <id>test</id>
+                                <phase/>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>2.6</version>
+                        <executions>
+                            <execution>
+                                <id>default-war</id>
+                                <phase/>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>install</id>
+            <activation>
+                <property><name>vivo-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>1.4.1</version>
+                        <executions>
+                            <execution>
+                                <id>enforce-properties</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireProperty>
+                                            <property>app-name</property>
+                                            <message>You must provide an application name (app-name)</message>
+                                        </requireProperty>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
new file mode 100644
index 00000000..70e7550f
--- /dev/null
+++ b/installer/solr/pom.xml
@@ -0,0 +1,135 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>solr</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-installer</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO Prepare Solr App</name>
+
+    <profiles>
+        <profile>
+            <id>package</id>
+            <activation>
+                <property><name>app-name</name></property>
+            </activation>
+            <build>
+                <finalName>${app-name}solr</finalName>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>2.6</version>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                </manifest>
+                            </archive>
+                            <archiveClasses>false</archiveClasses>
+                            <overlays>
+                                <overlay>
+                                    <groupId>org.vivoweb</groupId>
+                                    <artifactId>vitro-solr</artifactId>
+                                    <type>war</type>
+                                </overlay>
+                            </overlays>
+                            <webResources>
+                                <resource>
+                                    <directory>src/main/webResources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>pinstall</id>
+            <activation>
+                <property><name>tomcat-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>remove-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.10</version>
+                        <executions>
+                            <execution>
+                                <id>install</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>${project.artifactId}</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${tomcat-dir}/webapps/${project.build.finalName}</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-solr</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
new file mode 100644
index 00000000..51e4c1b8
--- /dev/null
+++ b/installer/solr/src/main/webResources/META-INF/context.xml
@@ -0,0 +1,9 @@
+<Context crossContext="true" override="true">
+   <Environment
+        type="java.lang.String" 
+        name="solr/home"  
+        value="${vivo-dir}/solr" override="true"/>
+
+   <!-- Disable persist sessions on shut down.-->
+   <Manager pathname="" />
+</Context>
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
new file mode 100644
index 00000000..6d55b17c
--- /dev/null
+++ b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -0,0 +1,13 @@
+log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
+log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}solr.log
+log4j.appender.AllAppender.MaxFileSize=10MB 
+log4j.appender.AllAppender.MaxBackupIndex=10 
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
+
+log4j.rootLogger=INFO, AllAppender 
+
+# Make all of the Solr classes quieter...
+log4j.logger.org.apache.solr.level = WARNING
+# ...except for this one.
+log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
new file mode 100644
index 00000000..2e66f7f8
--- /dev/null
+++ b/installer/webapp/pom.xml
@@ -0,0 +1,141 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-installer</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO Prepare Web App</name>
+
+    <profiles>
+        <profile>
+            <id>package</id>
+            <activation>
+                <property><name>app-name</name></property>
+            </activation>
+            <build>
+                <finalName>${app-name}</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>2.6</version>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                </manifest>
+                            </archive>
+                            <archiveClasses>false</archiveClasses>
+                            <overlays>
+                                <overlay>
+                                    <groupId>org.vivoweb</groupId>
+                                    <artifactId>vivo-webapp</artifactId>
+                                    <type>war</type>
+                                </overlay>
+                            </overlays>
+                            <webResources>
+                                <resource>
+                                    <directory>src/main/webResources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>pinstall</id>
+            <activation>
+                <property><name>tomcat-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>remove-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.10</version>
+                        <executions>
+                            <execution>
+                                <id>install</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>${project.artifactId}</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${tomcat-dir}/webapps/${project.build.finalName}</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vivo-api</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vivo-webapp</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/installer/webapp/src/main/webResources/META-INF/context.xml b/installer/webapp/src/main/webResources/META-INF/context.xml
new file mode 100644
index 00000000..415042c5
--- /dev/null
+++ b/installer/webapp/src/main/webResources/META-INF/context.xml
@@ -0,0 +1,9 @@
+<Context crossContext="true" override="true">
+   <Environment
+        type="java.lang.String" 
+        name="vitro/home"
+        value="${vivo-dir}" override="true"/>
+
+   <!-- Disable persist sessions on shut down.-->
+   <Manager pathname="" />
+</Context>
diff --git a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
new file mode 100644
index 00000000..f9d04c7a
--- /dev/null
+++ b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -0,0 +1,49 @@
+#
+# This file sets the log levels for the Vitro webapp.
+#
+# There are 8 principal logging levels, as follows:
+#     <-- more messages ALL TRACE DEBUG INFO WARN ERROR FATAL OFF fewer messages -->
+#
+# The default logging level is specified on the rootLogger. Other levels can be
+# set for individual classes or packages as desired.
+#
+# Examples of setting levels:
+#    log4j.logger.edu.cornell.mannlib.vitro.webapp.ConfigurationProperties=INFO
+#          -- sets INFO level for this one class
+#    log4j.logger.org.apache.catalina=INFO
+#          -- sets INFO level for all classes in "org.apache.catalina" package
+#             and any sub-packages.
+#
+# Documentation for this file can be found here:
+# http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PropertyConfigurator.html#doConfigure(java.lang.String,%20org.apache.log4j.spi.LoggerRepository)
+#
+# More information can be found here:
+# http://logging.apache.org/log4j/1.2/manual.html
+#
+# The "production" version of this file is log4j.properties.
+# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
+
+log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}.all.log
+log4j.appender.AllAppender.MaxFileSize=10MB
+log4j.appender.AllAppender.MaxBackupIndex=10
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
+
+
+log4j.rootLogger=INFO, AllAppender
+
+# These classes are too chatty to display INFO messages.
+log4j.logger.edu.cornell.mannlib.vitro.webapp.startup.StartupStatus=WARN
+log4j.logger.edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase=WARN
+log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN
+
+# Spring as a whole is too chatty to display INFO messages.
+log4j.logger.org.springframework=WARN
+
+# suppress odd warnings from libraries
+log4j.logger.com.hp.hpl.jena.sdb.layout2.LoaderTuplesNodes=FATAL
+log4j.logger.com.hp.hpl.jena.sdb.sql.SDBConnection=ERROR
+log4j.logger.org.openjena.riot=FATAL
+log4j.logger.org.apache.jena.riot=FATAL
+log4j.logger.org.directwebremoting=FATAL
diff --git a/installer/webapp/src/main/webapp/themes/readme b/installer/webapp/src/main/webapp/themes/readme
new file mode 100644
index 00000000..46466538
--- /dev/null
+++ b/installer/webapp/src/main/webapp/themes/readme
@@ -0,0 +1 @@
+Add you theme directories here
\ No newline at end of file
diff --git a/build.xml b/legacy/build.xml
similarity index 100%
rename from build.xml
rename to legacy/build.xml
diff --git a/config/licenser/known_exceptions.txt b/legacy/config/licenser/known_exceptions.txt
similarity index 100%
rename from config/licenser/known_exceptions.txt
rename to legacy/config/licenser/known_exceptions.txt
diff --git a/config/licenser/licenser.properties b/legacy/config/licenser/licenser.properties
similarity index 100%
rename from config/licenser/licenser.properties
rename to legacy/config/licenser/licenser.properties
diff --git a/doc/3rd-party-licenses.txt b/legacy/doc/3rd-party-licenses.txt
similarity index 100%
rename from doc/3rd-party-licenses.txt
rename to legacy/doc/3rd-party-licenses.txt
diff --git a/doc/README.txt b/legacy/doc/README.txt
similarity index 100%
rename from doc/README.txt
rename to legacy/doc/README.txt
diff --git a/doc/license.txt b/legacy/doc/license.txt
similarity index 100%
rename from doc/license.txt
rename to legacy/doc/license.txt
diff --git a/doc/licenses/aduna.LICENSE.txt b/legacy/doc/licenses/aduna.LICENSE.txt
similarity index 100%
rename from doc/licenses/aduna.LICENSE.txt
rename to legacy/doc/licenses/aduna.LICENSE.txt
diff --git a/doc/licenses/agpl.LICENSE.txt b/legacy/doc/licenses/agpl.LICENSE.txt
similarity index 100%
rename from doc/licenses/agpl.LICENSE.txt
rename to legacy/doc/licenses/agpl.LICENSE.txt
diff --git a/doc/licenses/antisamy.LICENSE.txt b/legacy/doc/licenses/antisamy.LICENSE.txt
similarity index 100%
rename from doc/licenses/antisamy.LICENSE.txt
rename to legacy/doc/licenses/antisamy.LICENSE.txt
diff --git a/doc/licenses/antlr.LICENSE.txt b/legacy/doc/licenses/antlr.LICENSE.txt
similarity index 100%
rename from doc/licenses/antlr.LICENSE.txt
rename to legacy/doc/licenses/antlr.LICENSE.txt
diff --git a/doc/licenses/apache.LICENSE.txt b/legacy/doc/licenses/apache.LICENSE.txt
similarity index 100%
rename from doc/licenses/apache.LICENSE.txt
rename to legacy/doc/licenses/apache.LICENSE.txt
diff --git a/doc/licenses/blueprintcss.LICENSE.txt b/legacy/doc/licenses/blueprintcss.LICENSE.txt
similarity index 100%
rename from doc/licenses/blueprintcss.LICENSE.txt
rename to legacy/doc/licenses/blueprintcss.LICENSE.txt
diff --git a/doc/licenses/cddl.LICENSE.txt b/legacy/doc/licenses/cddl.LICENSE.txt
similarity index 100%
rename from doc/licenses/cddl.LICENSE.txt
rename to legacy/doc/licenses/cddl.LICENSE.txt
diff --git a/doc/licenses/cos.LICENSE.txt b/legacy/doc/licenses/cos.LICENSE.txt
similarity index 100%
rename from doc/licenses/cos.LICENSE.txt
rename to legacy/doc/licenses/cos.LICENSE.txt
diff --git a/doc/licenses/cpl.LICENSE.txt b/legacy/doc/licenses/cpl.LICENSE.txt
similarity index 100%
rename from doc/licenses/cpl.LICENSE.txt
rename to legacy/doc/licenses/cpl.LICENSE.txt
diff --git a/doc/licenses/dojo.LICENSE.txt b/legacy/doc/licenses/dojo.LICENSE.txt
similarity index 100%
rename from doc/licenses/dojo.LICENSE.txt
rename to legacy/doc/licenses/dojo.LICENSE.txt
diff --git a/doc/licenses/dom4j.LICENSE.txt b/legacy/doc/licenses/dom4j.LICENSE.txt
similarity index 100%
rename from doc/licenses/dom4j.LICENSE.txt
rename to legacy/doc/licenses/dom4j.LICENSE.txt
diff --git a/doc/licenses/eclipse.LICENSE.txt b/legacy/doc/licenses/eclipse.LICENSE.txt
similarity index 100%
rename from doc/licenses/eclipse.LICENSE.txt
rename to legacy/doc/licenses/eclipse.LICENSE.txt
diff --git a/doc/licenses/extreme.LICENSE.txt b/legacy/doc/licenses/extreme.LICENSE.txt
similarity index 100%
rename from doc/licenses/extreme.LICENSE.txt
rename to legacy/doc/licenses/extreme.LICENSE.txt
diff --git a/doc/licenses/freemarker.LICENSE.txt b/legacy/doc/licenses/freemarker.LICENSE.txt
similarity index 100%
rename from doc/licenses/freemarker.LICENSE.txt
rename to legacy/doc/licenses/freemarker.LICENSE.txt
diff --git a/doc/licenses/googleanalytics.LICENSE.txt b/legacy/doc/licenses/googleanalytics.LICENSE.txt
similarity index 100%
rename from doc/licenses/googleanalytics.LICENSE.txt
rename to legacy/doc/licenses/googleanalytics.LICENSE.txt
diff --git a/doc/licenses/gpl2.LICENSE.txt b/legacy/doc/licenses/gpl2.LICENSE.txt
similarity index 100%
rename from doc/licenses/gpl2.LICENSE.txt
rename to legacy/doc/licenses/gpl2.LICENSE.txt
diff --git a/doc/licenses/icu.LICENSE.txt b/legacy/doc/licenses/icu.LICENSE.txt
similarity index 100%
rename from doc/licenses/icu.LICENSE.txt
rename to legacy/doc/licenses/icu.LICENSE.txt
diff --git a/doc/licenses/java.LICENSE.txt b/legacy/doc/licenses/java.LICENSE.txt
similarity index 100%
rename from doc/licenses/java.LICENSE.txt
rename to legacy/doc/licenses/java.LICENSE.txt
diff --git a/doc/licenses/jdom.LICENSE.txt b/legacy/doc/licenses/jdom.LICENSE.txt
similarity index 100%
rename from doc/licenses/jdom.LICENSE.txt
rename to legacy/doc/licenses/jdom.LICENSE.txt
diff --git a/doc/licenses/jena.LICENSE.txt b/legacy/doc/licenses/jena.LICENSE.txt
similarity index 100%
rename from doc/licenses/jena.LICENSE.txt
rename to legacy/doc/licenses/jena.LICENSE.txt
diff --git a/doc/licenses/json.LICENSE.txt b/legacy/doc/licenses/json.LICENSE.txt
similarity index 100%
rename from doc/licenses/json.LICENSE.txt
rename to legacy/doc/licenses/json.LICENSE.txt
diff --git a/doc/licenses/jsoup.LICENSE.txt b/legacy/doc/licenses/jsoup.LICENSE.txt
similarity index 100%
rename from doc/licenses/jsoup.LICENSE.txt
rename to legacy/doc/licenses/jsoup.LICENSE.txt
diff --git a/doc/licenses/jtidy.LICENSE.txt b/legacy/doc/licenses/jtidy.LICENSE.txt
similarity index 100%
rename from doc/licenses/jtidy.LICENSE.txt
rename to legacy/doc/licenses/jtidy.LICENSE.txt
diff --git a/doc/licenses/ldap.LICENSE.txt b/legacy/doc/licenses/ldap.LICENSE.txt
similarity index 100%
rename from doc/licenses/ldap.LICENSE.txt
rename to legacy/doc/licenses/ldap.LICENSE.txt
diff --git a/doc/licenses/leaflet.LICENSE.txt b/legacy/doc/licenses/leaflet.LICENSE.txt
similarity index 100%
rename from doc/licenses/leaflet.LICENSE.txt
rename to legacy/doc/licenses/leaflet.LICENSE.txt
diff --git a/doc/licenses/lgpl2.LICENSE.txt b/legacy/doc/licenses/lgpl2.LICENSE.txt
similarity index 100%
rename from doc/licenses/lgpl2.LICENSE.txt
rename to legacy/doc/licenses/lgpl2.LICENSE.txt
diff --git a/doc/licenses/lgpl3.LICENSE.txt b/legacy/doc/licenses/lgpl3.LICENSE.txt
similarity index 100%
rename from doc/licenses/lgpl3.LICENSE.txt
rename to legacy/doc/licenses/lgpl3.LICENSE.txt
diff --git a/doc/licenses/mit.LICENSE.txt b/legacy/doc/licenses/mit.LICENSE.txt
similarity index 100%
rename from doc/licenses/mit.LICENSE.txt
rename to legacy/doc/licenses/mit.LICENSE.txt
diff --git a/doc/licenses/mpl.LICENSE.txt b/legacy/doc/licenses/mpl.LICENSE.txt
similarity index 100%
rename from doc/licenses/mpl.LICENSE.txt
rename to legacy/doc/licenses/mpl.LICENSE.txt
diff --git a/doc/licenses/oracle.LICENSE.txt b/legacy/doc/licenses/oracle.LICENSE.txt
similarity index 100%
rename from doc/licenses/oracle.LICENSE.txt
rename to legacy/doc/licenses/oracle.LICENSE.txt
diff --git a/doc/licenses/sac-1.3-license.txt b/legacy/doc/licenses/sac-1.3-license.txt
similarity index 100%
rename from doc/licenses/sac-1.3-license.txt
rename to legacy/doc/licenses/sac-1.3-license.txt
diff --git a/doc/licenses/sdb.LICENSE.txt b/legacy/doc/licenses/sdb.LICENSE.txt
similarity index 100%
rename from doc/licenses/sdb.LICENSE.txt
rename to legacy/doc/licenses/sdb.LICENSE.txt
diff --git a/doc/licenses/sparqltag.LICENSE.txt b/legacy/doc/licenses/sparqltag.LICENSE.txt
similarity index 100%
rename from doc/licenses/sparqltag.LICENSE.txt
rename to legacy/doc/licenses/sparqltag.LICENSE.txt
diff --git a/doc/licenses/sun_binary.LICENSE.txt b/legacy/doc/licenses/sun_binary.LICENSE.txt
similarity index 100%
rename from doc/licenses/sun_binary.LICENSE.txt
rename to legacy/doc/licenses/sun_binary.LICENSE.txt
diff --git a/doc/licenses/sun_mail.LICENSE.txt b/legacy/doc/licenses/sun_mail.LICENSE.txt
similarity index 100%
rename from doc/licenses/sun_mail.LICENSE.txt
rename to legacy/doc/licenses/sun_mail.LICENSE.txt
diff --git a/doc/licenses/vivoontology-1.5.LICENSE.txt b/legacy/doc/licenses/vivoontology-1.5.LICENSE.txt
similarity index 100%
rename from doc/licenses/vivoontology-1.5.LICENSE.txt
rename to legacy/doc/licenses/vivoontology-1.5.LICENSE.txt
diff --git a/doc/licenses/xstream.LICENSE.txt b/legacy/doc/licenses/xstream.LICENSE.txt
similarity index 100%
rename from doc/licenses/xstream.LICENSE.txt
rename to legacy/doc/licenses/xstream.LICENSE.txt
diff --git a/example.build.properties b/legacy/example.build.properties
similarity index 100%
rename from example.build.properties
rename to legacy/example.build.properties
diff --git a/languages/es_GO/rdf/applicationMetadata/firsttime/classgroups_labels_es_GO.n3 b/legacy/languages/es_GO/rdf/applicationMetadata/firsttime/classgroups_labels_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/applicationMetadata/firsttime/classgroups_labels_es_GO.n3
rename to legacy/languages/es_GO/rdf/applicationMetadata/firsttime/classgroups_labels_es_GO.n3
diff --git a/languages/es_GO/rdf/applicationMetadata/firsttime/propertygroups_labels_es_GO.n3 b/legacy/languages/es_GO/rdf/applicationMetadata/firsttime/propertygroups_labels_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/applicationMetadata/firsttime/propertygroups_labels_es_GO.n3
rename to legacy/languages/es_GO/rdf/applicationMetadata/firsttime/propertygroups_labels_es_GO.n3
diff --git a/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3 b/legacy/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3
rename to legacy/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3
diff --git a/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3 b/legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
rename to legacy/languages/es_GO/rdf/display/firsttime/aboutPage_es_GO.n3
diff --git a/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3 b/legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
rename to legacy/languages/es_GO/rdf/display/firsttime/menu_es_GO.n3
diff --git a/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3 b/legacy/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3
similarity index 100%
rename from languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3
rename to legacy/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3
diff --git a/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
similarity index 100%
rename from languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
rename to legacy/languages/es_GO/templates/freemarker/aboutMapOfScience_es_GO.ftl
diff --git a/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl
similarity index 100%
rename from languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl
rename to legacy/languages/es_GO/templates/freemarker/aboutQrCodes_es_GO.ftl
diff --git a/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl b/legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
similarity index 100%
rename from languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
rename to legacy/languages/es_GO/templates/freemarker/mapOfScienceTooltips_es_GO.ftl
diff --git a/languages/es_GO/themes/wilma/i18n/all_es_GO.properties b/legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
similarity index 100%
rename from languages/es_GO/themes/wilma/i18n/all_es_GO.properties
rename to legacy/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
diff --git a/languages/es_GO/themes/wilma/i18n/images/select_locale_es_GO.png b/legacy/languages/es_GO/themes/wilma/i18n/images/select_locale_es_GO.png
similarity index 100%
rename from languages/es_GO/themes/wilma/i18n/images/select_locale_es_GO.png
rename to legacy/languages/es_GO/themes/wilma/i18n/images/select_locale_es_GO.png
diff --git a/utilities/ISF-transition/obsoleteUris/directory_walker.rb b/legacy/utilities/ISF-transition/obsoleteUris/directory_walker.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/directory_walker.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/directory_walker.rb
diff --git a/utilities/ISF-transition/obsoleteUris/doit b/legacy/utilities/ISF-transition/obsoleteUris/doit
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/doit
rename to legacy/utilities/ISF-transition/obsoleteUris/doit
diff --git a/utilities/ISF-transition/obsoleteUris/doit_old b/legacy/utilities/ISF-transition/obsoleteUris/doit_old
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/doit_old
rename to legacy/utilities/ISF-transition/obsoleteUris/doit_old
diff --git a/utilities/ISF-transition/obsoleteUris/event.rb b/legacy/utilities/ISF-transition/obsoleteUris/event.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/event.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/event.rb
diff --git a/utilities/ISF-transition/obsoleteUris/known_exceptions.rb b/legacy/utilities/ISF-transition/obsoleteUris/known_exceptions.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/known_exceptions.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/known_exceptions.rb
diff --git a/utilities/ISF-transition/obsoleteUris/obsoleteUriChecker.rb b/legacy/utilities/ISF-transition/obsoleteUris/obsoleteUriChecker.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/obsoleteUriChecker.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/obsoleteUriChecker.rb
diff --git a/utilities/ISF-transition/obsoleteUris/obsolete_uris.rb b/legacy/utilities/ISF-transition/obsoleteUris/obsolete_uris.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/obsolete_uris.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/obsolete_uris.rb
diff --git a/utilities/ISF-transition/obsoleteUris/report.rb b/legacy/utilities/ISF-transition/obsoleteUris/report.rb
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/report.rb
rename to legacy/utilities/ISF-transition/obsoleteUris/report.rb
diff --git a/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt b/legacy/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt
rename to legacy/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt
diff --git a/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions_old.txt b/legacy/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions_old.txt
similarity index 100%
rename from utilities/ISF-transition/obsoleteUris/vivo_known_exceptions_old.txt
rename to legacy/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions_old.txt
diff --git a/utilities/LoadTesting/distros/README.txt b/legacy/utilities/LoadTesting/distros/README.txt
similarity index 100%
rename from utilities/LoadTesting/distros/README.txt
rename to legacy/utilities/LoadTesting/distros/README.txt
diff --git a/utilities/LoadTesting/distros/release1.3/deploy.properties.template b/legacy/utilities/LoadTesting/distros/release1.3/deploy.properties.template
similarity index 100%
rename from utilities/LoadTesting/distros/release1.3/deploy.properties.template
rename to legacy/utilities/LoadTesting/distros/release1.3/deploy.properties.template
diff --git a/utilities/LoadTesting/distros/release1.3/distro_properties.rb b/legacy/utilities/LoadTesting/distros/release1.3/distro_properties.rb
similarity index 100%
rename from utilities/LoadTesting/distros/release1.3/distro_properties.rb
rename to legacy/utilities/LoadTesting/distros/release1.3/distro_properties.rb
diff --git a/utilities/LoadTesting/distros/release1.4/deploy.properties.template b/legacy/utilities/LoadTesting/distros/release1.4/deploy.properties.template
similarity index 100%
rename from utilities/LoadTesting/distros/release1.4/deploy.properties.template
rename to legacy/utilities/LoadTesting/distros/release1.4/deploy.properties.template
diff --git a/utilities/LoadTesting/distros/release1.4/distro_properties.rb b/legacy/utilities/LoadTesting/distros/release1.4/distro_properties.rb
similarity index 100%
rename from utilities/LoadTesting/distros/release1.4/distro_properties.rb
rename to legacy/utilities/LoadTesting/distros/release1.4/distro_properties.rb
diff --git a/utilities/LoadTesting/jmeter/README.txt b/legacy/utilities/LoadTesting/jmeter/README.txt
similarity index 100%
rename from utilities/LoadTesting/jmeter/README.txt
rename to legacy/utilities/LoadTesting/jmeter/README.txt
diff --git a/utilities/LoadTesting/jmeter/jakarta-jmeter-2.4.zip b/legacy/utilities/LoadTesting/jmeter/jakarta-jmeter-2.4.zip
similarity index 100%
rename from utilities/LoadTesting/jmeter/jakarta-jmeter-2.4.zip
rename to legacy/utilities/LoadTesting/jmeter/jakarta-jmeter-2.4.zip
diff --git a/utilities/LoadTesting/modelData/README.txt b/legacy/utilities/LoadTesting/modelData/README.txt
similarity index 100%
rename from utilities/LoadTesting/modelData/README.txt
rename to legacy/utilities/LoadTesting/modelData/README.txt
diff --git a/utilities/LoadTesting/modelData/_patches_and_queries/README.txt b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/README.txt
similarity index 100%
rename from utilities/LoadTesting/modelData/_patches_and_queries/README.txt
rename to legacy/utilities/LoadTesting/modelData/_patches_and_queries/README.txt
diff --git a/utilities/LoadTesting/modelData/_patches_and_queries/get_info_resource_uris.sparql b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/get_info_resource_uris.sparql
similarity index 100%
rename from utilities/LoadTesting/modelData/_patches_and_queries/get_info_resource_uris.sparql
rename to legacy/utilities/LoadTesting/modelData/_patches_and_queries/get_info_resource_uris.sparql
diff --git a/utilities/LoadTesting/modelData/_patches_and_queries/get_person_uris.sparql b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/get_person_uris.sparql
similarity index 100%
rename from utilities/LoadTesting/modelData/_patches_and_queries/get_person_uris.sparql
rename to legacy/utilities/LoadTesting/modelData/_patches_and_queries/get_person_uris.sparql
diff --git a/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
similarity index 100%
rename from utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
rename to legacy/utilities/LoadTesting/modelData/_patches_and_queries/image_file_query.sparql
diff --git a/utilities/LoadTesting/modelData/_patches_and_queries/userAccountsPatch.n3 b/legacy/utilities/LoadTesting/modelData/_patches_and_queries/userAccountsPatch.n3
similarity index 100%
rename from utilities/LoadTesting/modelData/_patches_and_queries/userAccountsPatch.n3
rename to legacy/utilities/LoadTesting/modelData/_patches_and_queries/userAccountsPatch.n3
diff --git a/utilities/LoadTesting/scripts/_captureTomcatLogs b/legacy/utilities/LoadTesting/scripts/_captureTomcatLogs
similarity index 100%
rename from utilities/LoadTesting/scripts/_captureTomcatLogs
rename to legacy/utilities/LoadTesting/scripts/_captureTomcatLogs
diff --git a/utilities/LoadTesting/scripts/_checkTomcat b/legacy/utilities/LoadTesting/scripts/_checkTomcat
similarity index 100%
rename from utilities/LoadTesting/scripts/_checkTomcat
rename to legacy/utilities/LoadTesting/scripts/_checkTomcat
diff --git a/utilities/LoadTesting/scripts/_clearTomcatLogs b/legacy/utilities/LoadTesting/scripts/_clearTomcatLogs
similarity index 100%
rename from utilities/LoadTesting/scripts/_clearTomcatLogs
rename to legacy/utilities/LoadTesting/scripts/_clearTomcatLogs
diff --git a/utilities/LoadTesting/scripts/_deploy b/legacy/utilities/LoadTesting/scripts/_deploy
similarity index 100%
rename from utilities/LoadTesting/scripts/_deploy
rename to legacy/utilities/LoadTesting/scripts/_deploy
diff --git a/utilities/LoadTesting/scripts/_fakeUploadedFiles b/legacy/utilities/LoadTesting/scripts/_fakeUploadedFiles
similarity index 100%
rename from utilities/LoadTesting/scripts/_fakeUploadedFiles
rename to legacy/utilities/LoadTesting/scripts/_fakeUploadedFiles
diff --git a/utilities/LoadTesting/scripts/_lessVivoLog b/legacy/utilities/LoadTesting/scripts/_lessVivoLog
similarity index 100%
rename from utilities/LoadTesting/scripts/_lessVivoLog
rename to legacy/utilities/LoadTesting/scripts/_lessVivoLog
diff --git a/utilities/LoadTesting/scripts/_mergeTestResults b/legacy/utilities/LoadTesting/scripts/_mergeTestResults
similarity index 100%
rename from utilities/LoadTesting/scripts/_mergeTestResults
rename to legacy/utilities/LoadTesting/scripts/_mergeTestResults
diff --git a/utilities/LoadTesting/scripts/_runTest b/legacy/utilities/LoadTesting/scripts/_runTest
similarity index 100%
rename from utilities/LoadTesting/scripts/_runTest
rename to legacy/utilities/LoadTesting/scripts/_runTest
diff --git a/utilities/LoadTesting/scripts/_setTest b/legacy/utilities/LoadTesting/scripts/_setTest
similarity index 100%
rename from utilities/LoadTesting/scripts/_setTest
rename to legacy/utilities/LoadTesting/scripts/_setTest
diff --git a/utilities/LoadTesting/scripts/_setVersion b/legacy/utilities/LoadTesting/scripts/_setVersion
similarity index 100%
rename from utilities/LoadTesting/scripts/_setVersion
rename to legacy/utilities/LoadTesting/scripts/_setVersion
diff --git a/utilities/LoadTesting/scripts/_startTomcat b/legacy/utilities/LoadTesting/scripts/_startTomcat
similarity index 100%
rename from utilities/LoadTesting/scripts/_startTomcat
rename to legacy/utilities/LoadTesting/scripts/_startTomcat
diff --git a/utilities/LoadTesting/scripts/_status b/legacy/utilities/LoadTesting/scripts/_status
similarity index 100%
rename from utilities/LoadTesting/scripts/_status
rename to legacy/utilities/LoadTesting/scripts/_status
diff --git a/utilities/LoadTesting/scripts/_stopTomcat b/legacy/utilities/LoadTesting/scripts/_stopTomcat
similarity index 100%
rename from utilities/LoadTesting/scripts/_stopTomcat
rename to legacy/utilities/LoadTesting/scripts/_stopTomcat
diff --git a/utilities/LoadTesting/scripts/_tailTomcatLogs b/legacy/utilities/LoadTesting/scripts/_tailTomcatLogs
similarity index 100%
rename from utilities/LoadTesting/scripts/_tailTomcatLogs
rename to legacy/utilities/LoadTesting/scripts/_tailTomcatLogs
diff --git a/utilities/LoadTesting/scripts/_update b/legacy/utilities/LoadTesting/scripts/_update
similarity index 100%
rename from utilities/LoadTesting/scripts/_update
rename to legacy/utilities/LoadTesting/scripts/_update
diff --git a/utilities/LoadTesting/scripts/_whichTest b/legacy/utilities/LoadTesting/scripts/_whichTest
similarity index 100%
rename from utilities/LoadTesting/scripts/_whichTest
rename to legacy/utilities/LoadTesting/scripts/_whichTest
diff --git a/utilities/LoadTesting/scripts/_whichVersion b/legacy/utilities/LoadTesting/scripts/_whichVersion
similarity index 100%
rename from utilities/LoadTesting/scripts/_whichVersion
rename to legacy/utilities/LoadTesting/scripts/_whichVersion
diff --git a/utilities/LoadTesting/scripts/subscripts/common.rb b/legacy/utilities/LoadTesting/scripts/subscripts/common.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/common.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/common.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/dummy_image_file.jpg b/legacy/utilities/LoadTesting/scripts/subscripts/dummy_image_file.jpg
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/dummy_image_file.jpg
rename to legacy/utilities/LoadTesting/scripts/subscripts/dummy_image_file.jpg
diff --git a/utilities/LoadTesting/scripts/subscripts/loadParms.rb b/legacy/utilities/LoadTesting/scripts/subscripts/loadParms.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/loadParms.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/loadParms.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/property_file_reader.rb b/legacy/utilities/LoadTesting/scripts/subscripts/property_file_reader.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/property_file_reader.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/property_file_reader.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/test_result_file.rb b/legacy/utilities/LoadTesting/scripts/subscripts/test_result_file.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/test_result_file.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/test_result_file.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/test_result_marshaller.rb b/legacy/utilities/LoadTesting/scripts/subscripts/test_result_marshaller.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/test_result_marshaller.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/test_result_marshaller.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/test_result_merger.rb b/legacy/utilities/LoadTesting/scripts/subscripts/test_result_merger.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/test_result_merger.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/test_result_merger.rb
diff --git a/utilities/LoadTesting/scripts/subscripts/upload_file_faker.rb b/legacy/utilities/LoadTesting/scripts/subscripts/upload_file_faker.rb
similarity index 100%
rename from utilities/LoadTesting/scripts/subscripts/upload_file_faker.rb
rename to legacy/utilities/LoadTesting/scripts/subscripts/upload_file_faker.rb
diff --git a/utilities/LoadTesting/sites/README.txt b/legacy/utilities/LoadTesting/sites/README.txt
similarity index 100%
rename from utilities/LoadTesting/sites/README.txt
rename to legacy/utilities/LoadTesting/sites/README.txt
diff --git a/utilities/LoadTesting/sites/cornell/site_properties.rb b/legacy/utilities/LoadTesting/sites/cornell/site_properties.rb
similarity index 100%
rename from utilities/LoadTesting/sites/cornell/site_properties.rb
rename to legacy/utilities/LoadTesting/sites/cornell/site_properties.rb
diff --git a/utilities/LoadTesting/sites/indiana/site_properties.rb b/legacy/utilities/LoadTesting/sites/indiana/site_properties.rb
similarity index 100%
rename from utilities/LoadTesting/sites/indiana/site_properties.rb
rename to legacy/utilities/LoadTesting/sites/indiana/site_properties.rb
diff --git a/utilities/LoadTesting/sites/scripps/site_properties.rb b/legacy/utilities/LoadTesting/sites/scripps/site_properties.rb
similarity index 100%
rename from utilities/LoadTesting/sites/scripps/site_properties.rb
rename to legacy/utilities/LoadTesting/sites/scripps/site_properties.rb
diff --git a/utilities/LoadTesting/testinfo/README.txt b/legacy/utilities/LoadTesting/testinfo/README.txt
similarity index 100%
rename from utilities/LoadTesting/testinfo/README.txt
rename to legacy/utilities/LoadTesting/testinfo/README.txt
diff --git a/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-2.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-2.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-2.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-2.jmx
diff --git a/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-3.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-3.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-3.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-3.jmx
diff --git a/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-4.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-4.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-4.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SecondTests/SecondTests-rel-1-4.jmx
diff --git a/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-2.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-2.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-2.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-2.jmx
diff --git a/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-3.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-3.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-3.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-3.jmx
diff --git a/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-4.jmx b/legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-4.jmx
similarity index 100%
rename from utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-4.jmx
rename to legacy/utilities/LoadTesting/testinfo/tests/SimpleTests/SimpleTests-1-4.jmx
diff --git a/utilities/LoadTesting/tomcat/README.txt b/legacy/utilities/LoadTesting/tomcat/README.txt
similarity index 100%
rename from utilities/LoadTesting/tomcat/README.txt
rename to legacy/utilities/LoadTesting/tomcat/README.txt
diff --git a/utilities/LoadTesting/versions/README.txt b/legacy/utilities/LoadTesting/versions/README.txt
similarity index 100%
rename from utilities/LoadTesting/versions/README.txt
rename to legacy/utilities/LoadTesting/versions/README.txt
diff --git a/utilities/acceptance-tests/example.acceptance_tests.properties b/legacy/utilities/acceptance-tests/example.acceptance_tests.properties
similarity index 100%
rename from utilities/acceptance-tests/example.acceptance_tests.properties
rename to legacy/utilities/acceptance-tests/example.acceptance_tests.properties
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/legacy/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
rename to legacy/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddArticle.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddBook.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddBook.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddBook.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddChapter.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddChapter.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddChapter.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddConference.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddConference.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddConference.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html b/legacy/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/legacy/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html b/legacy/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/PublicationDisplay.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html b/legacy/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/Suite.html b/legacy/utilities/acceptance-tests/suites/AddPublications/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/Suite.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/Suite.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/legacy/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
rename to legacy/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
diff --git a/utilities/acceptance-tests/suites/AddPublications/nintendo-logo.jpg b/legacy/utilities/acceptance-tests/suites/AddPublications/nintendo-logo.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/AddPublications/nintendo-logo.jpg
rename to legacy/utilities/acceptance-tests/suites/AddPublications/nintendo-logo.jpg
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/legacy/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/legacy/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/legacy/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/ChooseGrantsAndProjects.html b/legacy/utilities/acceptance-tests/suites/AddRoles/ChooseGrantsAndProjects.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/ChooseGrantsAndProjects.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/ChooseGrantsAndProjects.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html b/legacy/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/legacy/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/legacy/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/legacy/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/AddRoles/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/legacy/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/legacy/utilities/acceptance-tests/suites/AddRoles/suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AddRoles/suite.html
rename to legacy/utilities/acceptance-tests/suites/AddRoles/suite.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/NewAdminFirstLogin.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/legacy/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/AdminSecurity/Suite.html
rename to legacy/utilities/acceptance-tests/suites/AdminSecurity/Suite.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddTestFaculty.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/AddTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/AddTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteIndexStuff.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteIndexStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/DeleteIndexStuff.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteIndexStuff.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteTestFaculty.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/DeleteTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/DeleteTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/Suite.html b/legacy/utilities/acceptance-tests/suites/CheckMapOfScience/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckMapOfScience/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CheckMapOfScience/Suite.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/legacy/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
rename to legacy/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorLoginLogout.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckCuratorPrivileges.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorLoginLogout.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckEditorPrivileges.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewEditorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewLibrarian.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewLibrarian.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewProxyEditor.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewProxyEditor.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewProxyEditor.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewProxyEditor.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewOthersUsers.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewOthersUsers.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/DeleteNewOthersUsers.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewOthersUsers.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeEditorLogin.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/Suite.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/Suite.html
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html b/legacy/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html
rename to legacy/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/Suite.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/Suite.html
diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/legacy/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
rename to legacy/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleBrowse.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleBrowse.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/CheckPeopleBrowse.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleBrowse.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Jane1.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/Jane1.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/Jane1.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/Jane1.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Jane2.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/Jane2.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/Jane2.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/Jane2.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/ReorderMenus.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SetupTestTabs.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/SetupTestTabs.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/SetupTestTabs.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/SetupTestTabs.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/Suite.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/TestUnicodeName.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html b/legacy/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html
diff --git a/utilities/acceptance-tests/suites/CreatePeople/germany1.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/germany1.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/germany1.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/germany1.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/germany2.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/germany2.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/germany2.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/germany2.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lily1.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lily1.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily2.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/lily2.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lily2.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lily2.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily3.png b/legacy/utilities/acceptance-tests/suites/CreatePeople/lily3.png
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lily3.png
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lily3.png
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lily4.gif b/legacy/utilities/acceptance-tests/suites/CreatePeople/lily4.gif
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lily4.gif
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lily4.gif
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lilylarge.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/lilylarge.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lilylarge.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lilylarge.jpg
diff --git a/utilities/acceptance-tests/suites/CreatePeople/lilysmall.jpg b/legacy/utilities/acceptance-tests/suites/CreatePeople/lilysmall.jpg
similarity index 100%
rename from utilities/acceptance-tests/suites/CreatePeople/lilysmall.jpg
rename to legacy/utilities/acceptance-tests/suites/CreatePeople/lilysmall.jpg
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddDataPropArchDetails.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseum.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CreateProperties/Suite.html b/legacy/utilities/acceptance-tests/suites/CreateProperties/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CreateProperties/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CreateProperties/Suite.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteAdvises.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/SearchAdvises.html
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/Suite.html b/legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAdvisesForm/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CustomAdvisesForm/Suite.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/SearchAwards.html
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html b/legacy/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CustomAwardsForm/Suite.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html b/legacy/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomEducationForm/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CustomEducationForm/Suite.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CheckIndexView.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/Suite.html b/legacy/utilities/acceptance-tests/suites/CustomPositionsForm/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/CustomPositionsForm/Suite.html
rename to legacy/utilities/acceptance-tests/suites/CustomPositionsForm/Suite.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/CheckDefaultMenus.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/CreateHTMLPage.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/Suite.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/Suite.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/Suite.html
diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/legacy/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
similarity index 100%
rename from utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
rename to legacy/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/Suite.html b/legacy/utilities/acceptance-tests/suites/LanguageSupport/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/Suite.html
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/Suite.html
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/Test-utf8 b/legacy/utilities/acceptance-tests/suites/LanguageSupport/Test-utf8
similarity index 100%
rename from utilities/acceptance-tests/suites/LanguageSupport/Test-utf8
rename to legacy/utilities/acceptance-tests/suites/LanguageSupport/Test-utf8
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/Suite.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3 b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html b/legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html
similarity index 100%
rename from utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html
rename to legacy/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/Suite.html b/legacy/utilities/acceptance-tests/suites/MultiLabels/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/Suite.html
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/Suite.html
diff --git a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3 b/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.n3
diff --git a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt b/legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
similarity index 100%
rename from utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
rename to legacy/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/legacy/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
rename to legacy/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html b/legacy/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
rename to legacy/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/OntologyManagement/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/Suite.html b/legacy/utilities/acceptance-tests/suites/OntologyManagement/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OntologyManagement/Suite.html
rename to legacy/utilities/acceptance-tests/suites/OntologyManagement/Suite.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/AddTestFaculty.html b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/AddTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/AddTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/AddTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/DeleteTestFaculty.html b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/DeleteTestFaculty.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/DeleteTestFaculty.html
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/DeleteTestFaculty.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/Suite.html b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/Suite.html
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/Suite.html
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/securitytokenkey.txt b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/securitytokenkey.txt
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/securitytokenkey.txt
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/securitytokenkey.txt
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat b/legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
similarity index 100%
rename from utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
rename to legacy/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFInternetFile.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/AddRDFLocalFile.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFInternetFile.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/DeleteRDFLocalFile.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/Suite.html b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/Suite.html
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/Suite.html
diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf b/legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
similarity index 100%
rename from utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
rename to legacy/utilities/acceptance-tests/suites/ProcessRDFData/ontology_v2.0_Lite.rdf
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewLibrarian.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewLibrarian.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/CreateNewLibrarian.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewLibrarian.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewProxyEditors.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewProxyEditors.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/CreateNewProxyEditors.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewProxyEditors.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewPeople.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/Suite.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/Suite.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/Suite.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html b/legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html
rename to legacy/utilities/acceptance-tests/suites/ProxyEditing/ValidateUserProxy.html
diff --git a/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3 b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/BoostClass.n3
diff --git a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt b/legacy/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
diff --git a/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html b/legacy/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
diff --git a/utilities/acceptance-tests/suites/SearchBoost/DeleteTestPeople.html b/legacy/utilities/acceptance-tests/suites/SearchBoost/DeleteTestPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/DeleteTestPeople.html
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/DeleteTestPeople.html
diff --git a/utilities/acceptance-tests/suites/SearchBoost/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/SearchBoost/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/SearchBoost/Suite.html b/legacy/utilities/acceptance-tests/suites/SearchBoost/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/Suite.html
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/Suite.html
diff --git a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html b/legacy/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html
rename to legacy/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/Suite.html b/legacy/utilities/acceptance-tests/suites/SearchExclusion/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/Suite.html
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/Suite.html
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3 b/legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
rename to legacy/utilities/acceptance-tests/suites/SearchExclusion/TestSearchExclusion.n3
diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html b/legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html
rename to legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/DeleteStuff.html
diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchTextDiscovery/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/Suite.html b/legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchTextDiscovery/Suite.html
rename to legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/Suite.html
diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html b/legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
rename to legacy/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateFacultyMember.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/CreateFacultyMember.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/CreateFacultyMember.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/CreateFacultyMember.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/DeleteFacultyInfo.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/DeleteNewSelfEditorUser.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin2.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin2.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/FirstTimeSelfEditorLogin2.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/RestrictLogins.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/RestrictLogins.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/RestrictLogins.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/RestrictLogins.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/Suite.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/Suite.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/Suite.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword.html
diff --git a/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword2.html b/legacy/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword2.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword2.html
rename to legacy/utilities/acceptance-tests/suites/SelfEditing/TryNewSelfEditorPassword2.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/legacy/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/CheckResults.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html b/legacy/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/legacy/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html b/legacy/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html b/legacy/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/DeleteTestPeople.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html b/legacy/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/RebuildSearchIndex.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/Suite.html b/legacy/utilities/acceptance-tests/suites/ShortViews/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/Suite.html
rename to legacy/utilities/acceptance-tests/suites/ShortViews/Suite.html
diff --git a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
rename to legacy/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
rename to legacy/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
rename to legacy/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
rename to legacy/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl b/legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
similarity index 100%
rename from utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
rename to legacy/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
diff --git a/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
rename to legacy/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3
diff --git a/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 b/legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3
rename to legacy/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html b/legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html
similarity index 100%
rename from utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html
rename to legacy/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html
diff --git a/utilities/acceptance-tests/suites/ignored_tests.txt b/legacy/utilities/acceptance-tests/suites/ignored_tests.txt
similarity index 100%
rename from utilities/acceptance-tests/suites/ignored_tests.txt
rename to legacy/utilities/acceptance-tests/suites/ignored_tests.txt
diff --git a/utilities/acceptance-tests/testApp/TestLinkedOpenData.html b/legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html
similarity index 100%
rename from utilities/acceptance-tests/testApp/TestLinkedOpenData.html
rename to legacy/utilities/acceptance-tests/testApp/TestLinkedOpenData.html
diff --git a/utilities/acceptance-tests/testApp/TestListRDF.html b/legacy/utilities/acceptance-tests/testApp/TestListRDF.html
similarity index 100%
rename from utilities/acceptance-tests/testApp/TestListRDF.html
rename to legacy/utilities/acceptance-tests/testApp/TestListRDF.html
diff --git a/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html b/legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html
similarity index 100%
rename from utilities/acceptance-tests/testApp/TestSparqlQueryApi.html
rename to legacy/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html
diff --git a/utilities/acceptance-tests/testApp/js/jquery.js b/legacy/utilities/acceptance-tests/testApp/js/jquery.js
similarity index 100%
rename from utilities/acceptance-tests/testApp/js/jquery.js
rename to legacy/utilities/acceptance-tests/testApp/js/jquery.js
diff --git a/utilities/languageSupport/i18nChecker/check b/legacy/utilities/languageSupport/i18nChecker/check
similarity index 100%
rename from utilities/languageSupport/i18nChecker/check
rename to legacy/utilities/languageSupport/i18nChecker/check
diff --git a/utilities/languageSupport/i18nChecker/i18nChecker.rb b/legacy/utilities/languageSupport/i18nChecker/i18nChecker.rb
similarity index 100%
rename from utilities/languageSupport/i18nChecker/i18nChecker.rb
rename to legacy/utilities/languageSupport/i18nChecker/i18nChecker.rb
diff --git a/utilities/languageSupport/i18nChecker/properties_file_checker.rb b/legacy/utilities/languageSupport/i18nChecker/properties_file_checker.rb
similarity index 100%
rename from utilities/languageSupport/i18nChecker/properties_file_checker.rb
rename to legacy/utilities/languageSupport/i18nChecker/properties_file_checker.rb
diff --git a/utilities/languageSupport/i18nChecker/template_file_checker.rb b/legacy/utilities/languageSupport/i18nChecker/template_file_checker.rb
similarity index 100%
rename from utilities/languageSupport/i18nChecker/template_file_checker.rb
rename to legacy/utilities/languageSupport/i18nChecker/template_file_checker.rb
diff --git a/utilities/languageSupport/i18nChecker/template_set_checker.rb b/legacy/utilities/languageSupport/i18nChecker/template_set_checker.rb
similarity index 100%
rename from utilities/languageSupport/i18nChecker/template_set_checker.rb
rename to legacy/utilities/languageSupport/i18nChecker/template_set_checker.rb
diff --git a/utilities/languageSupport/translateDisplayNames/display_name_common.rb b/legacy/utilities/languageSupport/translateDisplayNames/display_name_common.rb
similarity index 100%
rename from utilities/languageSupport/translateDisplayNames/display_name_common.rb
rename to legacy/utilities/languageSupport/translateDisplayNames/display_name_common.rb
diff --git a/utilities/languageSupport/translateDisplayNames/display_name_inserter.rb b/legacy/utilities/languageSupport/translateDisplayNames/display_name_inserter.rb
similarity index 100%
rename from utilities/languageSupport/translateDisplayNames/display_name_inserter.rb
rename to legacy/utilities/languageSupport/translateDisplayNames/display_name_inserter.rb
diff --git a/utilities/languageSupport/translateDisplayNames/display_name_stripper.rb b/legacy/utilities/languageSupport/translateDisplayNames/display_name_stripper.rb
similarity index 100%
rename from utilities/languageSupport/translateDisplayNames/display_name_stripper.rb
rename to legacy/utilities/languageSupport/translateDisplayNames/display_name_stripper.rb
diff --git a/utilities/languageSupport/translateLabelsInOntology/label_common.rb b/legacy/utilities/languageSupport/translateLabelsInOntology/label_common.rb
similarity index 100%
rename from utilities/languageSupport/translateLabelsInOntology/label_common.rb
rename to legacy/utilities/languageSupport/translateLabelsInOntology/label_common.rb
diff --git a/utilities/languageSupport/translateLabelsInOntology/label_inserter.rb b/legacy/utilities/languageSupport/translateLabelsInOntology/label_inserter.rb
similarity index 100%
rename from utilities/languageSupport/translateLabelsInOntology/label_inserter.rb
rename to legacy/utilities/languageSupport/translateLabelsInOntology/label_inserter.rb
diff --git a/utilities/languageSupport/translateLabelsInOntology/label_stripper.rb b/legacy/utilities/languageSupport/translateLabelsInOntology/label_stripper.rb
similarity index 100%
rename from utilities/languageSupport/translateLabelsInOntology/label_stripper.rb
rename to legacy/utilities/languageSupport/translateLabelsInOntology/label_stripper.rb
diff --git a/utilities/languageSupport/translateLabelsInOntology/vivo_core_filter b/legacy/utilities/languageSupport/translateLabelsInOntology/vivo_core_filter
similarity index 100%
rename from utilities/languageSupport/translateLabelsInOntology/vivo_core_filter
rename to legacy/utilities/languageSupport/translateLabelsInOntology/vivo_core_filter
diff --git a/utilities/languageSupport/translateValuesInPropertyFile/property_common.rb b/legacy/utilities/languageSupport/translateValuesInPropertyFile/property_common.rb
similarity index 100%
rename from utilities/languageSupport/translateValuesInPropertyFile/property_common.rb
rename to legacy/utilities/languageSupport/translateValuesInPropertyFile/property_common.rb
diff --git a/utilities/languageSupport/translateValuesInPropertyFile/property_inserter.rb b/legacy/utilities/languageSupport/translateValuesInPropertyFile/property_inserter.rb
similarity index 100%
rename from utilities/languageSupport/translateValuesInPropertyFile/property_inserter.rb
rename to legacy/utilities/languageSupport/translateValuesInPropertyFile/property_inserter.rb
diff --git a/utilities/languageSupport/translateValuesInPropertyFile/property_stripper.rb b/legacy/utilities/languageSupport/translateValuesInPropertyFile/property_stripper.rb
similarity index 100%
rename from utilities/languageSupport/translateValuesInPropertyFile/property_stripper.rb
rename to legacy/utilities/languageSupport/translateValuesInPropertyFile/property_stripper.rb
diff --git a/utilities/orcid/mockorcid.war b/legacy/utilities/orcid/mockorcid.war
similarity index 100%
rename from utilities/orcid/mockorcid.war
rename to legacy/utilities/orcid/mockorcid.war
diff --git a/utilities/performance-measurement/README.txt b/legacy/utilities/performance-measurement/README.txt
similarity index 100%
rename from utilities/performance-measurement/README.txt
rename to legacy/utilities/performance-measurement/README.txt
diff --git a/utilities/performance-measurement/partition.rb b/legacy/utilities/performance-measurement/partition.rb
similarity index 100%
rename from utilities/performance-measurement/partition.rb
rename to legacy/utilities/performance-measurement/partition.rb
diff --git a/utilities/performance-measurement/partitions b/legacy/utilities/performance-measurement/partitions
similarity index 100%
rename from utilities/performance-measurement/partitions
rename to legacy/utilities/performance-measurement/partitions
diff --git a/utilities/performance-measurement/scan_query_times.rb b/legacy/utilities/performance-measurement/scan_query_times.rb
similarity index 100%
rename from utilities/performance-measurement/scan_query_times.rb
rename to legacy/utilities/performance-measurement/scan_query_times.rb
diff --git a/utilities/performance-measurement/scanner.rb b/legacy/utilities/performance-measurement/scanner.rb
similarity index 100%
rename from utilities/performance-measurement/scanner.rb
rename to legacy/utilities/performance-measurement/scanner.rb
diff --git a/utilities/pre-compileJSPs/jsp-build.xml b/legacy/utilities/pre-compileJSPs/jsp-build.xml
similarity index 100%
rename from utilities/pre-compileJSPs/jsp-build.xml
rename to legacy/utilities/pre-compileJSPs/jsp-build.xml
diff --git a/utilities/release1.6.1-scripts/addPublishTriplesToInitialTBoxAnnotations.rb b/legacy/utilities/release1.6.1-scripts/addPublishTriplesToInitialTBoxAnnotations.rb
similarity index 100%
rename from utilities/release1.6.1-scripts/addPublishTriplesToInitialTBoxAnnotations.rb
rename to legacy/utilities/release1.6.1-scripts/addPublishTriplesToInitialTBoxAnnotations.rb
diff --git a/utilities/release1.6.1-scripts/addPublishTriplesTovivo-tbox2.rb b/legacy/utilities/release1.6.1-scripts/addPublishTriplesTovivo-tbox2.rb
similarity index 100%
rename from utilities/release1.6.1-scripts/addPublishTriplesTovivo-tbox2.rb
rename to legacy/utilities/release1.6.1-scripts/addPublishTriplesTovivo-tbox2.rb
diff --git a/utilities/releaseScripts/1_setup.rb b/legacy/utilities/releaseScripts/1_setup.rb
similarity index 100%
rename from utilities/releaseScripts/1_setup.rb
rename to legacy/utilities/releaseScripts/1_setup.rb
diff --git a/utilities/releaseScripts/2_create_branches.rb b/legacy/utilities/releaseScripts/2_create_branches.rb
similarity index 100%
rename from utilities/releaseScripts/2_create_branches.rb
rename to legacy/utilities/releaseScripts/2_create_branches.rb
diff --git a/utilities/releaseScripts/3_create_tags.rb b/legacy/utilities/releaseScripts/3_create_tags.rb
similarity index 100%
rename from utilities/releaseScripts/3_create_tags.rb
rename to legacy/utilities/releaseScripts/3_create_tags.rb
diff --git a/utilities/releaseScripts/4_extract_files.rb b/legacy/utilities/releaseScripts/4_extract_files.rb
similarity index 100%
rename from utilities/releaseScripts/4_extract_files.rb
rename to legacy/utilities/releaseScripts/4_extract_files.rb
diff --git a/utilities/releaseScripts/5_insert_revision_info.rb b/legacy/utilities/releaseScripts/5_insert_revision_info.rb
similarity index 100%
rename from utilities/releaseScripts/5_insert_revision_info.rb
rename to legacy/utilities/releaseScripts/5_insert_revision_info.rb
diff --git a/utilities/releaseScripts/6_insert_documentation.rb b/legacy/utilities/releaseScripts/6_insert_documentation.rb
similarity index 100%
rename from utilities/releaseScripts/6_insert_documentation.rb
rename to legacy/utilities/releaseScripts/6_insert_documentation.rb
diff --git a/utilities/releaseScripts/7_create_distribution_files.rb b/legacy/utilities/releaseScripts/7_create_distribution_files.rb
similarity index 100%
rename from utilities/releaseScripts/7_create_distribution_files.rb
rename to legacy/utilities/releaseScripts/7_create_distribution_files.rb
diff --git a/utilities/releaseScripts/8_merge_to_master.rb b/legacy/utilities/releaseScripts/8_merge_to_master.rb
similarity index 100%
rename from utilities/releaseScripts/8_merge_to_master.rb
rename to legacy/utilities/releaseScripts/8_merge_to_master.rb
diff --git a/utilities/releaseScripts/9_push_changes.rb b/legacy/utilities/releaseScripts/9_push_changes.rb
similarity index 100%
rename from utilities/releaseScripts/9_push_changes.rb
rename to legacy/utilities/releaseScripts/9_push_changes.rb
diff --git a/utilities/releaseScripts/_common.rb b/legacy/utilities/releaseScripts/_common.rb
similarity index 100%
rename from utilities/releaseScripts/_common.rb
rename to legacy/utilities/releaseScripts/_common.rb
diff --git a/utilities/xslt/generalizedXMLtoRDF.xsl b/legacy/utilities/xslt/generalizedXMLtoRDF.xsl
similarity index 100%
rename from utilities/xslt/generalizedXMLtoRDF.xsl
rename to legacy/utilities/xslt/generalizedXMLtoRDF.xsl
diff --git a/lib/agrovocws-3.0.jar b/lib/agrovocws-3.0.jar
deleted file mode 100644
index 5581be71..00000000
Binary files a/lib/agrovocws-3.0.jar and /dev/null differ
diff --git a/lib/axis.jar b/lib/axis.jar
deleted file mode 100644
index 9458fa4f..00000000
Binary files a/lib/axis.jar and /dev/null differ
diff --git a/lib/commons-discovery-0.2.jar b/lib/commons-discovery-0.2.jar
deleted file mode 100644
index 5db59d2e..00000000
Binary files a/lib/commons-discovery-0.2.jar and /dev/null differ
diff --git a/lib/ehcache-spring-annotations-1.1.3.jar b/lib/ehcache-spring-annotations-1.1.3.jar
deleted file mode 100644
index be81cf7f..00000000
Binary files a/lib/ehcache-spring-annotations-1.1.3.jar and /dev/null differ
diff --git a/lib/htmlparser.jar b/lib/htmlparser.jar
deleted file mode 100644
index fad7a207..00000000
Binary files a/lib/htmlparser.jar and /dev/null differ
diff --git a/lib/oim.vivo.scimapcore.jar b/lib/oim.vivo.scimapcore.jar
deleted file mode 100644
index 41330650..00000000
Binary files a/lib/oim.vivo.scimapcore.jar and /dev/null differ
diff --git a/lib/orcid-api-client-0.2.jar b/lib/orcid-api-client-0.2.jar
deleted file mode 100644
index 62068d09..00000000
Binary files a/lib/orcid-api-client-0.2.jar and /dev/null differ
diff --git a/lib/skosapi-3-bin.jar b/lib/skosapi-3-bin.jar
deleted file mode 100644
index 8a484059..00000000
Binary files a/lib/skosapi-3-bin.jar and /dev/null differ
diff --git a/lib/webserviceutils.jar b/lib/webserviceutils.jar
deleted file mode 100644
index a7f8126b..00000000
Binary files a/lib/webserviceutils.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..19340f8a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,126 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo-project</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <vitro-core>../Vitro</vitro-core>
+        <vitro-version>${project.version}</vitro-version>
+        <vivo-dir>${basedir}</vivo-dir>
+    </properties>
+
+    <name>VIVO</name>
+
+    <modules>
+        <module>api</module>
+        <module>webapp</module>
+        <module>home</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>vitro</id>
+            <activation>
+                <file>
+                    <exists>${vivo-dir}/${vitro-core}/pom.xml</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>${vitro-core}</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>installer</id>
+            <activation>
+                <property>
+                    <name>!vivo-installer-dir</name>
+                </property>
+            </activation>
+            <modules>
+                <module>installer</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>external-installer</id>
+            <activation>
+                <property>
+                    <name>vivo-installer-dir</name>
+                </property>
+            </activation>
+            <modules>
+                <module>${vivo-installer-dir}</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.vivoweb</groupId>
+                <artifactId>vitro-api</artifactId>
+                <version>${vitro-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.vivoweb</groupId>
+                <artifactId>vitro-api</artifactId>
+                <version>${vitro-version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.vivoweb</groupId>
+                <artifactId>vitro-webapp</artifactId>
+                <version>${vitro-version}</version>
+                <type>war</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>build.properties</file>
+                            </files>
+                            <quiet>true</quiet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>vivo-dependencies</id>
+            <name>VIVO Dependencies</name>
+            <url>https://raw.github.com/vivo-project/dependencies/master/</url>
+        </repository>
+    </repositories>
+</project>
diff --git a/webapp/pom.xml b/webapp/pom.xml
new file mode 100644
index 00000000..15d83636
--- /dev/null
+++ b/webapp/pom.xml
@@ -0,0 +1,60 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vivo-webapp</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vivo-project</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>VIVO Web App</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <archiveClasses>false</archiveClasses>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.vivoweb</groupId>
+                            <artifactId>vitro-webapp</artifactId>
+                            <type>war</type>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-webapp</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vivo-api</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/productMods/WEB-INF/ontologies/update15to16/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/askUpdated.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/askUpdated.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/diff.tab.txt b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/diff.tab.txt
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/diff.tab.txt
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/geopolitical-ver1.1-11-18-11-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/isDefinedBy-1.5-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldAnnotations/scires-1.5-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/scires-1.5-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldAnnotations/scires-1.5-annotations.rdf
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/scires-1.5-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vitro-0.7-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldAnnotations/vivo-core-1.5-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/isDefinedBy-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/scires-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/scires-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/scires-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/scires-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-bibo-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-c4o-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-c4o-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-c4o-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-c4o-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-core-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-core-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-core-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-core-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcelements-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcelements-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcelements-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcelements-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcterms-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcterms-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcterms-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-dcterms-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-event-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-event-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-event-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-event-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-fabio-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-foaf-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-foaf-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-foaf-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-foaf-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-pws-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-pws-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-pws-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-pws-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-skos-1.5.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-skos-1.5.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/oldVersion/vivo-skos-1.5.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/oldVersion/vivo-skos-1.5.owl
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdviseeRole.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/AdvisorRole.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/Editorship.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/LeaderRole.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/MemberRole.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/concept.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grant-pre.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/grantAdmin.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/orcid.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/Grant.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardConferred.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/awardedDegree.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/post/contributingAdvising.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-0.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-1.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-2.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard1-3.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard22.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2a.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2b.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2c.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2d.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2e.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2f.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2g.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2h.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2i.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard2j.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard3.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard4.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard5.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard6.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard7.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard8.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/additions/vcard9.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/EditorshipDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/conceptDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/grant-pre-del.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/orcidDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardConferredDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/post/awardedDegreeDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/sparqlConstructs/deletions/vcardDel.sparql
diff --git a/productMods/WEB-INF/ontologies/update15to16/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update15to16/success.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update15to16/success.n3
diff --git a/productMods/WEB-INF/ontologies/update16to17/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/askUpdated.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/askUpdated.sparql
diff --git a/productMods/WEB-INF/ontologies/update16to17/diff.tab.txt b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/diff.tab.txt
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/diff.tab.txt
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/diff.tab.txt
diff --git a/productMods/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/additionalHiding.n3
diff --git a/productMods/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldAnnotations/initialTBoxAnnotations.n3
diff --git a/productMods/WEB-INF/ontologies/update16to17/oldVersion/empty.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/oldVersion/empty.owl
diff --git a/productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/post/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/post/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/post/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/additions/post/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/post/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/post/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/post/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/sparqlConstructs/deletions/post/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update16to17/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update16to17/success.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update16to17/success.n3
diff --git a/productMods/WEB-INF/ontologies/update17to18/askUpdated.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/askUpdated.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/askUpdated.sparql
diff --git a/productMods/WEB-INF/ontologies/update17to18/diff.tab.txt b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/diff.tab.txt
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/diff.tab.txt
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/diff.tab.txt
diff --git a/rdf/tbox/firsttime/additionalHiding.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
similarity index 100%
rename from rdf/tbox/firsttime/additionalHiding.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/additionalHiding.n3
diff --git a/productMods/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldAnnotations/initialTBoxAnnotations.n3
diff --git a/productMods/WEB-INF/ontologies/update17to18/oldVersion/empty.owl b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/oldVersion/empty.owl
diff --git a/productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/post/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/post/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/post/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/additions/post/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/post/nothing.sparql b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/post/nothing.sparql
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/post/nothing.sparql
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/sparqlConstructs/deletions/post/nothing.sparql
diff --git a/productMods/WEB-INF/ontologies/update17to18/success.n3 b/webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3
similarity index 100%
rename from productMods/WEB-INF/ontologies/update17to18/success.n3
rename to webapp/src/main/webapp/WEB-INF/ontologies/update17to18/success.n3
diff --git a/productMods/WEB-INF/resources/reasoner_plugins.txt b/webapp/src/main/webapp/WEB-INF/resources/reasoner_plugins.txt
similarity index 100%
rename from productMods/WEB-INF/resources/reasoner_plugins.txt
rename to webapp/src/main/webapp/WEB-INF/resources/reasoner_plugins.txt
diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
similarity index 100%
rename from productMods/WEB-INF/resources/startup_listeners.txt
rename to webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
diff --git a/productMods/WEB-INF/rich-export/address/address.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/address/address.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/address/address.sparql
diff --git a/productMods/WEB-INF/rich-export/address/locationOfAddress.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/address/locationOfAddress.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/address/locationOfAddress.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/advisee.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/advisee.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/advisee.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/associatedDegree.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/associatedDegree.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedDegree.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql
diff --git a/productMods/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql
diff --git a/productMods/WEB-INF/rich-export/award/award.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/award/award.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/award/award.sparql
diff --git a/productMods/WEB-INF/rich-export/award/conferringOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/award/conferringOrganization.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/award/conferringOrganization.sparql
diff --git a/productMods/WEB-INF/rich-export/award/sponsoringOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/award/sponsoringOrganization.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/award/sponsoringOrganization.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/credential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/credential.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/credential.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/eligibleForCredential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/eligibleForCredential.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/eligibleForCredential.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/issuedCredential.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/issuedCredential.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredential.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql
diff --git a/productMods/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql
diff --git a/productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql
diff --git a/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/funding/grantAwardedBy.sparql
diff --git a/productMods/WEB-INF/rich-export/funding/grants.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/funding/grants.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/funding/grants.sparql
diff --git a/productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/membership/memberRoleIn.sparql
diff --git a/productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/outreach/outreachRoleIn.sparql
diff --git a/productMods/WEB-INF/rich-export/patent/assignee.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/patent/assignee.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/patent/assignee.sparql
diff --git a/productMods/WEB-INF/rich-export/patent/inventors.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/patent/inventors.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/patent/inventors.sparql
diff --git a/productMods/WEB-INF/rich-export/patent/patent.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/patent/patent.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/patent/patent.sparql
diff --git a/productMods/WEB-INF/rich-export/patent/patentFiledDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/patent/patentFiledDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/patent/patentFiledDate.sparql
diff --git a/productMods/WEB-INF/rich-export/patent/patentIssuedDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/patent/patentIssuedDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/patent/patentIssuedDate.sparql
diff --git a/productMods/WEB-INF/rich-export/position/locationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/position/locationForPosition.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/position/locationForPosition.sparql
diff --git a/productMods/WEB-INF/rich-export/position/organizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/position/organizationForPosition.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/position/organizationForPosition.sparql
diff --git a/productMods/WEB-INF/rich-export/position/subOrganizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/position/subOrganizationForPosition.sparql
diff --git a/productMods/WEB-INF/rich-export/position/superOrganizationForPosition.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/position/superOrganizationForPosition.sparql
diff --git a/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingLocation.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingLocation.sparql
diff --git a/productMods/WEB-INF/rich-export/presentation/meetingName.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/presentation/meetingName.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/presentation/meetingName.sparql
diff --git a/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/associatedJournal.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/associatedJournal.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/associatedJournal.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/authors.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/authors.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/authors.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/presentedAtEvent.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/presentedAtEvent.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEvent.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventEndDate.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/presentedAtEventStartDate.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publication.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publication.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publication.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publicationDate.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publicationDate.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationDate.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationPartOfInfoResource.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publicationReproducedIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationReproducedIn.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publicationStatus.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publicationStatus.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationStatus.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publicationURL.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publicationURL.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publicationURL.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publisher_variant1.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publisher_variant1.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant1.sparql
diff --git a/productMods/WEB-INF/rich-export/publication/publisher_variant2.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/publication/publisher_variant2.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/publication/publisher_variant2.sparql
diff --git a/productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql b/webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
similarity index 100%
rename from productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
rename to webapp/src/main/webapp/WEB-INF/rich-export/teaching/teacherRoleIn.sparql
diff --git a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml
similarity index 100%
rename from productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml
rename to webapp/src/main/webapp/WEB-INF/visualization/visualizations-beans-injection-fm.xml
diff --git a/productMods/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from productMods/WEB-INF/web.xml
rename to webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/productMods/config/listViewConfig-additionalEmail.xml b/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml
similarity index 100%
rename from productMods/config/listViewConfig-additionalEmail.xml
rename to webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml
diff --git a/productMods/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
similarity index 100%
rename from productMods/config/listViewConfig-adviseeIn.xml
rename to webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml
diff --git a/productMods/config/listViewConfig-advisorIn.xml b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml
similarity index 100%
rename from productMods/config/listViewConfig-advisorIn.xml
rename to webapp/src/main/webapp/config/listViewConfig-advisorIn.xml
diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml
similarity index 100%
rename from productMods/config/listViewConfig-authorInAuthorship.xml
rename to webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml
diff --git a/productMods/config/listViewConfig-awardOrHonor.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml
similarity index 100%
rename from productMods/config/listViewConfig-awardOrHonor.xml
rename to webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml
diff --git a/productMods/config/listViewConfig-awardOrHonorGiven.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml
similarity index 100%
rename from productMods/config/listViewConfig-awardOrHonorGiven.xml
rename to webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml
diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
similarity index 100%
rename from productMods/config/listViewConfig-dateTimeInterval.xml
rename to webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml
diff --git a/productMods/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
similarity index 100%
rename from productMods/config/listViewConfig-dateTimeValue.xml
rename to webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml
diff --git a/productMods/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml
similarity index 100%
rename from productMods/config/listViewConfig-default.xml
rename to webapp/src/main/webapp/config/listViewConfig-default.xml
diff --git a/productMods/config/listViewConfig-degreeEarned.xml b/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml
similarity index 100%
rename from productMods/config/listViewConfig-degreeEarned.xml
rename to webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml
diff --git a/productMods/config/listViewConfig-doi.xml b/webapp/src/main/webapp/config/listViewConfig-doi.xml
similarity index 100%
rename from productMods/config/listViewConfig-doi.xml
rename to webapp/src/main/webapp/config/listViewConfig-doi.xml
diff --git a/productMods/config/listViewConfig-editorship.xml b/webapp/src/main/webapp/config/listViewConfig-editorship.xml
similarity index 100%
rename from productMods/config/listViewConfig-editorship.xml
rename to webapp/src/main/webapp/config/listViewConfig-editorship.xml
diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml
similarity index 100%
rename from productMods/config/listViewConfig-educationalTraining.xml
rename to webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml
diff --git a/productMods/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
similarity index 100%
rename from productMods/config/listViewConfig-fauxPropertyDefault.xml
rename to webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml
diff --git a/productMods/config/listViewConfig-faxNumber.xml b/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml
similarity index 100%
rename from productMods/config/listViewConfig-faxNumber.xml
rename to webapp/src/main/webapp/config/listViewConfig-faxNumber.xml
diff --git a/productMods/config/listViewConfig-fullName.xml b/webapp/src/main/webapp/config/listViewConfig-fullName.xml
similarity index 100%
rename from productMods/config/listViewConfig-fullName.xml
rename to webapp/src/main/webapp/config/listViewConfig-fullName.xml
diff --git a/productMods/config/listViewConfig-grantAdministeredBy.xml b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml
similarity index 100%
rename from productMods/config/listViewConfig-grantAdministeredBy.xml
rename to webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml
diff --git a/productMods/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasAssociatedConcept.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml
diff --git a/productMods/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasAttendeeRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml
diff --git a/productMods/config/listViewConfig-hasClinicalActivity.xml b/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasClinicalActivity.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml
diff --git a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
diff --git a/productMods/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasEditorRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml
diff --git a/productMods/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasInvestigatorRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml
diff --git a/productMods/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasPresenterRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml
diff --git a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml
diff --git a/productMods/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasReviewerRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml
diff --git a/productMods/config/listViewConfig-hasRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-hasRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-hasRole.xml
diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml
similarity index 85%
rename from productMods/config/listViewConfig-informationResourceInAuthorship.xml
rename to webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml
index c9aea300..98f4f697 100644
--- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml
@@ -75,9 +75,7 @@
             ?authorVCardMST rdfs:subClassOf vcard:Kind .
 
             ?authorVCard vcard:hasName ?vName .
-            ?vName vcard:familyName ?lastName .
-            ?vName vcard:givenName ?firstName .
-            ?vName core:middleName ?middleName .
+            ?vName ?vNameProperty ?vNameValue .
         } WHERE {
             {
                 ?subject ?property ?authorship .
@@ -110,21 +108,7 @@
                 ?authorship core:relates ?authorVCard .
                 ?authorVCard a vcard:Kind .
                 ?authorVCard vcard:hasName ?vName .
-                ?vName vcard:familyName ?lastName .
-            } UNION {
-                ?subject ?property ?authorship .
-                ?authorship a core:Authorship .
-                ?authorship core:relates ?authorVCard .
-                ?authorVCard a vcard:Kind .
-                ?authorVCard vcard:hasName ?vName .
-                ?vName vcard:givenName ?firstName .
-            } UNION {
-                ?subject ?property ?authorship .
-                ?authorship a core:Authorship .
-                ?authorship core:relates ?authorVCard .
-                ?authorVCard a vcard:Kind .
-                ?author vcard:hasName ?vName .
-                ?vName core:middleName ?middleName .
+                ?vName ?vNameProperty ?vNameValue .
             }
         }
     </query-construct>
diff --git a/productMods/config/listViewConfig-informationResourceInEditorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml
similarity index 100%
rename from productMods/config/listViewConfig-informationResourceInEditorship.xml
rename to webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml
diff --git a/productMods/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
similarity index 100%
rename from productMods/config/listViewConfig-issuedCredential.xml
rename to webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml
diff --git a/productMods/config/listViewConfig-mailingAddress.xml b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml
similarity index 100%
rename from productMods/config/listViewConfig-mailingAddress.xml
rename to webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml
diff --git a/productMods/config/listViewConfig-orcidId.xml b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml
similarity index 100%
rename from productMods/config/listViewConfig-orcidId.xml
rename to webapp/src/main/webapp/config/listViewConfig-orcidId.xml
diff --git a/productMods/config/listViewConfig-organizationAdministersGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml
similarity index 100%
rename from productMods/config/listViewConfig-organizationAdministersGrant.xml
rename to webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml
diff --git a/productMods/config/listViewConfig-organizationAwardsGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml
similarity index 100%
rename from productMods/config/listViewConfig-organizationAwardsGrant.xml
rename to webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml
diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml
similarity index 100%
rename from productMods/config/listViewConfig-organizationForPosition.xml
rename to webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml
diff --git a/productMods/config/listViewConfig-organizationForTraining.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml
similarity index 100%
rename from productMods/config/listViewConfig-organizationForTraining.xml
rename to webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml
diff --git a/productMods/config/listViewConfig-personInPosition.xml b/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml
similarity index 100%
rename from productMods/config/listViewConfig-personInPosition.xml
rename to webapp/src/main/webapp/config/listViewConfig-personInPosition.xml
diff --git a/productMods/config/listViewConfig-preferredTitle.xml b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml
similarity index 100%
rename from productMods/config/listViewConfig-preferredTitle.xml
rename to webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml
diff --git a/productMods/config/listViewConfig-primaryEmail.xml b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml
similarity index 100%
rename from productMods/config/listViewConfig-primaryEmail.xml
rename to webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml
diff --git a/productMods/config/listViewConfig-publicationVenueFor.xml b/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml
similarity index 100%
rename from productMods/config/listViewConfig-publicationVenueFor.xml
rename to webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml
diff --git a/productMods/config/listViewConfig-publisherOf.xml b/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml
similarity index 100%
rename from productMods/config/listViewConfig-publisherOf.xml
rename to webapp/src/main/webapp/config/listViewConfig-publisherOf.xml
diff --git a/productMods/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
similarity index 100%
rename from productMods/config/listViewConfig-rangeUnion.xml
rename to webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml
diff --git a/productMods/config/listViewConfig-relatedRole.xml b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
similarity index 100%
rename from productMods/config/listViewConfig-relatedRole.xml
rename to webapp/src/main/webapp/config/listViewConfig-relatedRole.xml
diff --git a/productMods/config/listViewConfig-researchActivities.xml b/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml
similarity index 100%
rename from productMods/config/listViewConfig-researchActivities.xml
rename to webapp/src/main/webapp/config/listViewConfig-researchActivities.xml
diff --git a/productMods/config/listViewConfig-researchAreaOf.xml b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
similarity index 100%
rename from productMods/config/listViewConfig-researchAreaOf.xml
rename to webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
diff --git a/productMods/config/listViewConfig-roleContributesTo.xml b/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml
similarity index 100%
rename from productMods/config/listViewConfig-roleContributesTo.xml
rename to webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml
diff --git a/productMods/config/listViewConfig-roleRealizedIn.xml b/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml
similarity index 100%
rename from productMods/config/listViewConfig-roleRealizedIn.xml
rename to webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml
diff --git a/productMods/config/listViewConfig-scopusId.xml b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml
similarity index 100%
rename from productMods/config/listViewConfig-scopusId.xml
rename to webapp/src/main/webapp/config/listViewConfig-scopusId.xml
diff --git a/productMods/config/listViewConfig-telephoneNumber.xml b/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml
similarity index 100%
rename from productMods/config/listViewConfig-telephoneNumber.xml
rename to webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml
diff --git a/productMods/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml
similarity index 100%
rename from productMods/config/listViewConfig-webpage.xml
rename to webapp/src/main/webapp/config/listViewConfig-webpage.xml
diff --git a/productMods/counter.jsp b/webapp/src/main/webapp/counter.jsp
similarity index 100%
rename from productMods/counter.jsp
rename to webapp/src/main/webapp/counter.jsp
diff --git a/productMods/css/harvester/fileharvest.css b/webapp/src/main/webapp/css/harvester/fileharvest.css
similarity index 100%
rename from productMods/css/harvester/fileharvest.css
rename to webapp/src/main/webapp/css/harvester/fileharvest.css
diff --git a/productMods/css/home-page-maps.css b/webapp/src/main/webapp/css/home-page-maps.css
similarity index 100%
rename from productMods/css/home-page-maps.css
rename to webapp/src/main/webapp/css/home-page-maps.css
diff --git a/productMods/css/individual/ie7-quick-view.css b/webapp/src/main/webapp/css/individual/ie7-quick-view.css
similarity index 100%
rename from productMods/css/individual/ie7-quick-view.css
rename to webapp/src/main/webapp/css/individual/ie7-quick-view.css
diff --git a/productMods/css/individual/ie7-standard-view.css b/webapp/src/main/webapp/css/individual/ie7-standard-view.css
similarity index 100%
rename from productMods/css/individual/ie7-standard-view.css
rename to webapp/src/main/webapp/css/individual/ie7-standard-view.css
diff --git a/productMods/css/individual/individual-2column-view.css b/webapp/src/main/webapp/css/individual/individual-2column-view.css
similarity index 100%
rename from productMods/css/individual/individual-2column-view.css
rename to webapp/src/main/webapp/css/individual/individual-2column-view.css
diff --git a/productMods/css/individual/individual-qr.css b/webapp/src/main/webapp/css/individual/individual-qr.css
similarity index 100%
rename from productMods/css/individual/individual-qr.css
rename to webapp/src/main/webapp/css/individual/individual-qr.css
diff --git a/productMods/css/individual/individual-quick-view.css b/webapp/src/main/webapp/css/individual/individual-quick-view.css
similarity index 100%
rename from productMods/css/individual/individual-quick-view.css
rename to webapp/src/main/webapp/css/individual/individual-quick-view.css
diff --git a/productMods/css/individual/individual-vivo.css b/webapp/src/main/webapp/css/individual/individual-vivo.css
similarity index 100%
rename from productMods/css/individual/individual-vivo.css
rename to webapp/src/main/webapp/css/individual/individual-vivo.css
diff --git a/productMods/css/jquery_plugins/ui.notify.css b/webapp/src/main/webapp/css/jquery_plugins/ui.notify.css
similarity index 100%
rename from productMods/css/jquery_plugins/ui.notify.css
rename to webapp/src/main/webapp/css/jquery_plugins/ui.notify.css
diff --git a/productMods/css/visualization/coauthorship/style.css b/webapp/src/main/webapp/css/visualization/coauthorship/style.css
similarity index 100%
rename from productMods/css/visualization/coauthorship/style.css
rename to webapp/src/main/webapp/css/visualization/coauthorship/style.css
diff --git a/productMods/css/visualization/entitycomparison/layout-ie-67.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css
similarity index 100%
rename from productMods/css/visualization/entitycomparison/layout-ie-67.css
rename to webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie-67.css
diff --git a/productMods/css/visualization/entitycomparison/layout-ie.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css
similarity index 100%
rename from productMods/css/visualization/entitycomparison/layout-ie.css
rename to webapp/src/main/webapp/css/visualization/entitycomparison/layout-ie.css
diff --git a/productMods/css/visualization/entitycomparison/layout.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
similarity index 100%
rename from productMods/css/visualization/entitycomparison/layout.css
rename to webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
diff --git a/productMods/css/visualization/mapofscience/layout.css b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
similarity index 100%
rename from productMods/css/visualization/mapofscience/layout.css
rename to webapp/src/main/webapp/css/visualization/mapofscience/layout.css
diff --git a/productMods/css/visualization/personlevel/page.css b/webapp/src/main/webapp/css/visualization/personlevel/page.css
similarity index 100%
rename from productMods/css/visualization/personlevel/page.css
rename to webapp/src/main/webapp/css/visualization/personlevel/page.css
diff --git a/productMods/css/visualization/visualization.css b/webapp/src/main/webapp/css/visualization/visualization.css
similarity index 100%
rename from productMods/css/visualization/visualization.css
rename to webapp/src/main/webapp/css/visualization/visualization.css
diff --git a/productMods/favicon.ico b/webapp/src/main/webapp/favicon.ico
similarity index 100%
rename from productMods/favicon.ico
rename to webapp/src/main/webapp/favicon.ico
diff --git a/productMods/images/count-background.png b/webapp/src/main/webapp/images/count-background.png
similarity index 100%
rename from productMods/images/count-background.png
rename to webapp/src/main/webapp/images/count-background.png
diff --git a/productMods/images/iconInfo-small.png b/webapp/src/main/webapp/images/iconInfo-small.png
similarity index 100%
rename from productMods/images/iconInfo-small.png
rename to webapp/src/main/webapp/images/iconInfo-small.png
diff --git a/productMods/images/individual/contact-info-icon.png b/webapp/src/main/webapp/images/individual/contact-info-icon.png
similarity index 100%
rename from productMods/images/individual/contact-info-icon.png
rename to webapp/src/main/webapp/images/individual/contact-info-icon.png
diff --git a/productMods/images/individual/download-icon.png b/webapp/src/main/webapp/images/individual/download-icon.png
similarity index 100%
rename from productMods/images/individual/download-icon.png
rename to webapp/src/main/webapp/images/individual/download-icon.png
diff --git a/productMods/images/individual/fullViewIcon.png b/webapp/src/main/webapp/images/individual/fullViewIcon.png
similarity index 100%
rename from productMods/images/individual/fullViewIcon.png
rename to webapp/src/main/webapp/images/individual/fullViewIcon.png
diff --git a/productMods/images/individual/pub-total-bkgrnd.png b/webapp/src/main/webapp/images/individual/pub-total-bkgrnd.png
similarity index 100%
rename from productMods/images/individual/pub-total-bkgrnd.png
rename to webapp/src/main/webapp/images/individual/pub-total-bkgrnd.png
diff --git a/productMods/images/individual/qr-code-icon.png b/webapp/src/main/webapp/images/individual/qr-code-icon.png
similarity index 100%
rename from productMods/images/individual/qr-code-icon.png
rename to webapp/src/main/webapp/images/individual/qr-code-icon.png
diff --git a/productMods/images/individual/qr_icon.png b/webapp/src/main/webapp/images/individual/qr_icon.png
similarity index 100%
rename from productMods/images/individual/qr_icon.png
rename to webapp/src/main/webapp/images/individual/qr_icon.png
diff --git a/productMods/images/individual/quickViewIcon.png b/webapp/src/main/webapp/images/individual/quickViewIcon.png
similarity index 100%
rename from productMods/images/individual/quickViewIcon.png
rename to webapp/src/main/webapp/images/individual/quickViewIcon.png
diff --git a/productMods/images/individual/research-group-icon.png b/webapp/src/main/webapp/images/individual/research-group-icon.png
similarity index 100%
rename from productMods/images/individual/research-group-icon.png
rename to webapp/src/main/webapp/images/individual/research-group-icon.png
diff --git a/productMods/images/individual/researchAreaBubble.png b/webapp/src/main/webapp/images/individual/researchAreaBubble.png
similarity index 100%
rename from productMods/images/individual/researchAreaBubble.png
rename to webapp/src/main/webapp/images/individual/researchAreaBubble.png
diff --git a/productMods/images/individual/share-uri-icon.png b/webapp/src/main/webapp/images/individual/share-uri-icon.png
similarity index 100%
rename from productMods/images/individual/share-uri-icon.png
rename to webapp/src/main/webapp/images/individual/share-uri-icon.png
diff --git a/productMods/images/individual/toolTipBubble.png b/webapp/src/main/webapp/images/individual/toolTipBubble.png
similarity index 100%
rename from productMods/images/individual/toolTipBubble.png
rename to webapp/src/main/webapp/images/individual/toolTipBubble.png
diff --git a/productMods/images/individual/uriIcon.gif b/webapp/src/main/webapp/images/individual/uriIcon.gif
similarity index 100%
rename from productMods/images/individual/uriIcon.gif
rename to webapp/src/main/webapp/images/individual/uriIcon.gif
diff --git a/productMods/images/individual/weblinkIconLarge.png b/webapp/src/main/webapp/images/individual/weblinkIconLarge.png
similarity index 100%
rename from productMods/images/individual/weblinkIconLarge.png
rename to webapp/src/main/webapp/images/individual/weblinkIconLarge.png
diff --git a/productMods/images/individual/weblinkIconSmall.png b/webapp/src/main/webapp/images/individual/weblinkIconSmall.png
similarity index 100%
rename from productMods/images/individual/weblinkIconSmall.png
rename to webapp/src/main/webapp/images/individual/weblinkIconSmall.png
diff --git a/productMods/images/individual/webpage-popout-bottom.png b/webapp/src/main/webapp/images/individual/webpage-popout-bottom.png
similarity index 100%
rename from productMods/images/individual/webpage-popout-bottom.png
rename to webapp/src/main/webapp/images/individual/webpage-popout-bottom.png
diff --git a/productMods/images/individual/webpage-popout-top.png b/webapp/src/main/webapp/images/individual/webpage-popout-top.png
similarity index 100%
rename from productMods/images/individual/webpage-popout-top.png
rename to webapp/src/main/webapp/images/individual/webpage-popout-top.png
diff --git a/productMods/images/map_legend_countries.png b/webapp/src/main/webapp/images/map_legend_countries.png
similarity index 100%
rename from productMods/images/map_legend_countries.png
rename to webapp/src/main/webapp/images/map_legend_countries.png
diff --git a/productMods/images/map_legend_regions.png b/webapp/src/main/webapp/images/map_legend_regions.png
similarity index 100%
rename from productMods/images/map_legend_regions.png
rename to webapp/src/main/webapp/images/map_legend_regions.png
diff --git a/productMods/images/placeholders/person.bordered.thumbnail.jpg b/webapp/src/main/webapp/images/placeholders/person.bordered.thumbnail.jpg
similarity index 100%
rename from productMods/images/placeholders/person.bordered.thumbnail.jpg
rename to webapp/src/main/webapp/images/placeholders/person.bordered.thumbnail.jpg
diff --git a/productMods/images/placeholders/person.thumbnail.jpg b/webapp/src/main/webapp/images/placeholders/person.thumbnail.jpg
similarity index 100%
rename from productMods/images/placeholders/person.thumbnail.jpg
rename to webapp/src/main/webapp/images/placeholders/person.thumbnail.jpg
diff --git a/productMods/images/placeholders/placeholders.properties b/webapp/src/main/webapp/images/placeholders/placeholders.properties
similarity index 100%
rename from productMods/images/placeholders/placeholders.properties
rename to webapp/src/main/webapp/images/placeholders/placeholders.properties
diff --git a/productMods/images/visualization/ajax-loader-indicator.gif b/webapp/src/main/webapp/images/visualization/ajax-loader-indicator.gif
similarity index 100%
rename from productMods/images/visualization/ajax-loader-indicator.gif
rename to webapp/src/main/webapp/images/visualization/ajax-loader-indicator.gif
diff --git a/productMods/images/visualization/ajax-loader.gif b/webapp/src/main/webapp/images/visualization/ajax-loader.gif
similarity index 100%
rename from productMods/images/visualization/ajax-loader.gif
rename to webapp/src/main/webapp/images/visualization/ajax-loader.gif
diff --git a/productMods/images/visualization/coauthorship/CoAuthor.swf b/webapp/src/main/webapp/images/visualization/coauthorship/CoAuthor.swf
similarity index 100%
rename from productMods/images/visualization/coauthorship/CoAuthor.swf
rename to webapp/src/main/webapp/images/visualization/coauthorship/CoAuthor.swf
diff --git a/productMods/images/visualization/coauthorship/EgoCentric.swf b/webapp/src/main/webapp/images/visualization/coauthorship/EgoCentric.swf
similarity index 100%
rename from productMods/images/visualization/coauthorship/EgoCentric.swf
rename to webapp/src/main/webapp/images/visualization/coauthorship/EgoCentric.swf
diff --git a/productMods/images/visualization/coauthorship/bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/bg.gif
diff --git a/productMods/images/visualization/coauthorship/boeder.gif b/webapp/src/main/webapp/images/visualization/coauthorship/boeder.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/boeder.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/boeder.gif
diff --git a/productMods/images/visualization/coauthorship/bottom_shadow.gif b/webapp/src/main/webapp/images/visualization/coauthorship/bottom_shadow.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/bottom_shadow.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/bottom_shadow.gif
diff --git a/productMods/images/visualization/coauthorship/co_author_icon.png b/webapp/src/main/webapp/images/visualization/coauthorship/co_author_icon.png
similarity index 100%
rename from productMods/images/visualization/coauthorship/co_author_icon.png
rename to webapp/src/main/webapp/images/visualization/coauthorship/co_author_icon.png
diff --git a/productMods/images/visualization/coauthorship/co_investigator_icon.png b/webapp/src/main/webapp/images/visualization/coauthorship/co_investigator_icon.png
similarity index 100%
rename from productMods/images/visualization/coauthorship/co_investigator_icon.png
rename to webapp/src/main/webapp/images/visualization/coauthorship/co_investigator_icon.png
diff --git a/productMods/images/visualization/coauthorship/contact_bottom.gif b/webapp/src/main/webapp/images/visualization/coauthorship/contact_bottom.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/contact_bottom.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/contact_bottom.gif
diff --git a/productMods/images/visualization/coauthorship/contact_h2_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/contact_h2_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/contact_h2_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/contact_h2_bg.gif
diff --git a/productMods/images/visualization/coauthorship/contact_midle.gif b/webapp/src/main/webapp/images/visualization/coauthorship/contact_midle.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/contact_midle.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/contact_midle.gif
diff --git a/productMods/images/visualization/coauthorship/contact_top.gif b/webapp/src/main/webapp/images/visualization/coauthorship/contact_top.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/contact_top.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/contact_top.gif
diff --git a/productMods/images/visualization/coauthorship/event_link_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/event_link_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/event_link_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/event_link_bg.gif
diff --git a/productMods/images/visualization/coauthorship/midle_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/midle_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/midle_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/midle_bg.gif
diff --git a/productMods/images/visualization/coauthorship/more_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/more_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/more_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/more_bg.gif
diff --git a/productMods/images/visualization/coauthorship/more_bg_h.gif b/webapp/src/main/webapp/images/visualization/coauthorship/more_bg_h.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/more_bg_h.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/more_bg_h.gif
diff --git a/productMods/images/visualization/coauthorship/newsletter_bottom.gif b/webapp/src/main/webapp/images/visualization/coauthorship/newsletter_bottom.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/newsletter_bottom.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/newsletter_bottom.gif
diff --git a/productMods/images/visualization/coauthorship/newsletter_h2_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/newsletter_h2_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/newsletter_h2_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/newsletter_h2_bg.gif
diff --git a/productMods/images/visualization/coauthorship/newsletter_midle.gif b/webapp/src/main/webapp/images/visualization/coauthorship/newsletter_midle.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/newsletter_midle.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/newsletter_midle.gif
diff --git a/productMods/images/visualization/coauthorship/newsletter_top.gif b/webapp/src/main/webapp/images/visualization/coauthorship/newsletter_top.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/newsletter_top.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/newsletter_top.gif
diff --git a/productMods/images/visualization/coauthorship/no_image.png b/webapp/src/main/webapp/images/visualization/coauthorship/no_image.png
similarity index 100%
rename from productMods/images/visualization/coauthorship/no_image.png
rename to webapp/src/main/webapp/images/visualization/coauthorship/no_image.png
diff --git a/productMods/images/visualization/coauthorship/playerProductInstall.swf b/webapp/src/main/webapp/images/visualization/coauthorship/playerProductInstall.swf
similarity index 100%
rename from productMods/images/visualization/coauthorship/playerProductInstall.swf
rename to webapp/src/main/webapp/images/visualization/coauthorship/playerProductInstall.swf
diff --git a/productMods/images/visualization/coauthorship/red_arrow.gif b/webapp/src/main/webapp/images/visualization/coauthorship/red_arrow.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/red_arrow.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/red_arrow.gif
diff --git a/productMods/images/visualization/coauthorship/red_bullet.gif b/webapp/src/main/webapp/images/visualization/coauthorship/red_bullet.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/red_bullet.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/red_bullet.gif
diff --git a/productMods/images/visualization/coauthorship/search_h2_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/search_h2_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/search_h2_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/search_h2_bg.gif
diff --git a/productMods/images/visualization/coauthorship/submit_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/submit_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/submit_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/submit_bg.gif
diff --git a/productMods/images/visualization/coauthorship/top_btn_h.gif b/webapp/src/main/webapp/images/visualization/coauthorship/top_btn_h.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/top_btn_h.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/top_btn_h.gif
diff --git a/productMods/images/visualization/coauthorship/top_shadow.gif b/webapp/src/main/webapp/images/visualization/coauthorship/top_shadow.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/top_shadow.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/top_shadow.gif
diff --git a/productMods/images/visualization/coauthorship/top_ul_bg.gif b/webapp/src/main/webapp/images/visualization/coauthorship/top_ul_bg.gif
similarity index 100%
rename from productMods/images/visualization/coauthorship/top_ul_bg.gif
rename to webapp/src/main/webapp/images/visualization/coauthorship/top_ul_bg.gif
diff --git a/productMods/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_100x100.png b/webapp/src/main/webapp/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_100x100.png
similarity index 100%
rename from productMods/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_100x100.png
rename to webapp/src/main/webapp/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_100x100.png
diff --git a/productMods/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_200x200.png b/webapp/src/main/webapp/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_200x200.png
similarity index 100%
rename from productMods/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_200x200.png
rename to webapp/src/main/webapp/images/visualization/collaboration/VIVO_COAUTHOR_PUBS_200x200.png
diff --git a/productMods/images/visualization/collaboration/VIVO_COPI_moneybag_100x100.png b/webapp/src/main/webapp/images/visualization/collaboration/VIVO_COPI_moneybag_100x100.png
similarity index 100%
rename from productMods/images/visualization/collaboration/VIVO_COPI_moneybag_100x100.png
rename to webapp/src/main/webapp/images/visualization/collaboration/VIVO_COPI_moneybag_100x100.png
diff --git a/productMods/images/visualization/collaboration/VIVO_COPI_moneybag_200x200.png b/webapp/src/main/webapp/images/visualization/collaboration/VIVO_COPI_moneybag_200x200.png
similarity index 100%
rename from productMods/images/visualization/collaboration/VIVO_COPI_moneybag_200x200.png
rename to webapp/src/main/webapp/images/visualization/collaboration/VIVO_COPI_moneybag_200x200.png
diff --git a/productMods/images/visualization/collaboration/vivo_money_36x36.png b/webapp/src/main/webapp/images/visualization/collaboration/vivo_money_36x36.png
similarity index 100%
rename from productMods/images/visualization/collaboration/vivo_money_36x36.png
rename to webapp/src/main/webapp/images/visualization/collaboration/vivo_money_36x36.png
diff --git a/productMods/images/visualization/collaboration/vivo_pubs_36x36.png b/webapp/src/main/webapp/images/visualization/collaboration/vivo_pubs_36x36.png
similarity index 100%
rename from productMods/images/visualization/collaboration/vivo_pubs_36x36.png
rename to webapp/src/main/webapp/images/visualization/collaboration/vivo_pubs_36x36.png
diff --git a/productMods/images/visualization/diagonal.png b/webapp/src/main/webapp/images/visualization/diagonal.png
similarity index 100%
rename from productMods/images/visualization/diagonal.png
rename to webapp/src/main/webapp/images/visualization/diagonal.png
diff --git a/productMods/images/visualization/drill_down_icon.png b/webapp/src/main/webapp/images/visualization/drill_down_icon.png
similarity index 100%
rename from productMods/images/visualization/drill_down_icon.png
rename to webapp/src/main/webapp/images/visualization/drill_down_icon.png
diff --git a/productMods/images/visualization/drill_up_icon.png b/webapp/src/main/webapp/images/visualization/drill_up_icon.png
similarity index 100%
rename from productMods/images/visualization/drill_up_icon.png
rename to webapp/src/main/webapp/images/visualization/drill_up_icon.png
diff --git a/productMods/images/visualization/legend-unknown-bar-dark.png b/webapp/src/main/webapp/images/visualization/legend-unknown-bar-dark.png
similarity index 100%
rename from productMods/images/visualization/legend-unknown-bar-dark.png
rename to webapp/src/main/webapp/images/visualization/legend-unknown-bar-dark.png
diff --git a/productMods/images/visualization/legend-unknown-bar-light.png b/webapp/src/main/webapp/images/visualization/legend-unknown-bar-light.png
similarity index 100%
rename from productMods/images/visualization/legend-unknown-bar-light.png
rename to webapp/src/main/webapp/images/visualization/legend-unknown-bar-light.png
diff --git a/productMods/images/visualization/mapofscience/about/scimap_comparison.jpg b/webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_comparison.jpg
similarity index 100%
rename from productMods/images/visualization/mapofscience/about/scimap_comparison.jpg
rename to webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_comparison.jpg
diff --git a/productMods/images/visualization/mapofscience/about/scimap_discipline.jpg b/webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_discipline.jpg
similarity index 100%
rename from productMods/images/visualization/mapofscience/about/scimap_discipline.jpg
rename to webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_discipline.jpg
diff --git a/productMods/images/visualization/mapofscience/about/scimap_subdiscipline.jpg b/webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_subdiscipline.jpg
similarity index 100%
rename from productMods/images/visualization/mapofscience/about/scimap_subdiscipline.jpg
rename to webapp/src/main/webapp/images/visualization/mapofscience/about/scimap_subdiscipline.jpg
diff --git a/productMods/images/visualization/mapofscience/labels/bio.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/bio.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/bio.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/bio.png
diff --git a/productMods/images/visualization/mapofscience/labels/biotech.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/biotech.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/biotech.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/biotech.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/bio.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/bio.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/bio.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/bio.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/biotech.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/biotech.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/biotech.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/biotech.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/brain.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/brain.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/brain.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/brain.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/chem.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/chem.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/chem.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/chem.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/chemeng.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/chemeng.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/chemeng.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/chemeng.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/earthsci.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/earthsci.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/earthsci.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/earthsci.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/eecs.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/eecs.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/eecs.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/eecs.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/health.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/health.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/health.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/health.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/human.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/human.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/human.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/human.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/infect.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/infect.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/infect.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/infect.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/mathphys.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/mathphys.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/mathphys.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/mathphys.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/medspec.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/medspec.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/medspec.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/medspec.png
diff --git a/productMods/images/visualization/mapofscience/labels/black/socsci.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/black/socsci.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/black/socsci.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/black/socsci.png
diff --git a/productMods/images/visualization/mapofscience/labels/brain.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/brain.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/brain.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/brain.png
diff --git a/productMods/images/visualization/mapofscience/labels/chem.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/chem.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/chem.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/chem.png
diff --git a/productMods/images/visualization/mapofscience/labels/chemeng.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/chemeng.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/chemeng.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/chemeng.png
diff --git a/productMods/images/visualization/mapofscience/labels/earthsci.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/earthsci.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/earthsci.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/earthsci.png
diff --git a/productMods/images/visualization/mapofscience/labels/eecs.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/eecs.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/eecs.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/eecs.png
diff --git a/productMods/images/visualization/mapofscience/labels/health.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/health.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/health.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/health.png
diff --git a/productMods/images/visualization/mapofscience/labels/human.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/human.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/human.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/human.png
diff --git a/productMods/images/visualization/mapofscience/labels/infect.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/infect.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/infect.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/infect.png
diff --git a/productMods/images/visualization/mapofscience/labels/mathphys.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/mathphys.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/mathphys.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/mathphys.png
diff --git a/productMods/images/visualization/mapofscience/labels/medspec.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/medspec.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/medspec.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/medspec.png
diff --git a/productMods/images/visualization/mapofscience/labels/socsci.png b/webapp/src/main/webapp/images/visualization/mapofscience/labels/socsci.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/labels/socsci.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/labels/socsci.png
diff --git a/productMods/images/visualization/mapofscience/scimap_icon.png b/webapp/src/main/webapp/images/visualization/mapofscience/scimap_icon.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/scimap_icon.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/scimap_icon.png
diff --git a/productMods/images/visualization/mapofscience/tiles/blank.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/blank.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/blank.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/blank.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles1_0_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_0_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles1_0_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_0_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles1_0_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_0_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles1_0_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_0_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles1_1_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_1_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles1_1_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_1_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles1_1_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_1_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles1_1_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles1_1_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_0_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_0_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_0_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_0_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_0_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_0_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_0_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_1_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_1_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_1_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_1_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_1_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_1_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_1_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_2_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_2_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_2_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_2_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_2_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_2_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_2_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_3_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_3_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_3_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_3_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles2_3_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles2_3_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles2_3_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_0_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_0_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_0_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_0_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_0_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_0_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_0_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_0_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_0_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_0_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_0_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_1_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_1_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_1_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_1_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_1_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_1_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_1_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_1_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_1_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_1_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_1_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_2_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_2_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_2_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_2_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_2_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_2_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_2_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_2_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_2_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_2_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_2_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_3_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_3_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_3_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_3_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_3_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_3_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_3_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_3_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_3_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_3_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_3_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_4_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_4_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_4_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_4_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_4_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_4_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_4_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_4_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_4_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_4_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_4_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_5_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_5_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_5_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_5_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_5_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_5_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_5_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_5_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_5_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_5_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_5_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_6_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_6_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_6_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_6_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_6_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_6_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_6_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_6_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_6_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_6_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_6_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_7_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_7_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_7_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_7_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_7_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_7_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_7_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_7_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles3_7_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles3_7_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles3_7_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_0_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_0_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_0_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_10_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_10_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_10_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_11_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_11_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_11_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_12_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_12_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_12_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_13_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_13_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_13_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_14_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_14_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_14_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_15_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_15_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_15_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_1_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_1_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_1_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_2_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_2_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_2_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_3_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_3_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_3_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_4_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_4_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_4_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_5_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_5_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_5_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_6_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_6_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_6_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_7_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_7_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_7_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_8_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_8_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_8_9.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_0.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_0.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_0.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_0.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_1.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_1.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_1.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_1.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_2.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_2.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_2.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_2.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_3.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_3.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_3.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_3.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_4.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_4.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_4.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_4.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_5.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_5.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_5.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_5.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_6.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_6.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_6.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_6.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_7.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_7.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_7.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_7.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_8.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_8.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_8.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_8.png
diff --git a/productMods/images/visualization/mapofscience/tiles/tiles4_9_9.png b/webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_9.png
similarity index 100%
rename from productMods/images/visualization/mapofscience/tiles/tiles4_9_9.png
rename to webapp/src/main/webapp/images/visualization/mapofscience/tiles/tiles4_9_9.png
diff --git a/productMods/images/visualization/mapofscience/tooltip/tt_bottom.gif b/webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_bottom.gif
similarity index 100%
rename from productMods/images/visualization/mapofscience/tooltip/tt_bottom.gif
rename to webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_bottom.gif
diff --git a/productMods/images/visualization/mapofscience/tooltip/tt_left.gif b/webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_left.gif
similarity index 100%
rename from productMods/images/visualization/mapofscience/tooltip/tt_left.gif
rename to webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_left.gif
diff --git a/productMods/images/visualization/mapofscience/tooltip/tt_top.gif b/webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_top.gif
similarity index 100%
rename from productMods/images/visualization/mapofscience/tooltip/tt_top.gif
rename to webapp/src/main/webapp/images/visualization/mapofscience/tooltip/tt_top.gif
diff --git a/productMods/images/visualization/refresh-16.png b/webapp/src/main/webapp/images/visualization/refresh-16.png
similarity index 100%
rename from productMods/images/visualization/refresh-16.png
rename to webapp/src/main/webapp/images/visualization/refresh-16.png
diff --git a/productMods/images/visualization/refresh-green.png b/webapp/src/main/webapp/images/visualization/refresh-green.png
similarity index 100%
rename from productMods/images/visualization/refresh-green.png
rename to webapp/src/main/webapp/images/visualization/refresh-green.png
diff --git a/productMods/images/visualization/refresh.png b/webapp/src/main/webapp/images/visualization/refresh.png
similarity index 100%
rename from productMods/images/visualization/refresh.png
rename to webapp/src/main/webapp/images/visualization/refresh.png
diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-down.png b/webapp/src/main/webapp/images/visualization/temporalgraph/temporal-drill-down.png
similarity index 100%
rename from productMods/images/visualization/temporalgraph/temporal-drill-down.png
rename to webapp/src/main/webapp/images/visualization/temporalgraph/temporal-drill-down.png
diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-up.png b/webapp/src/main/webapp/images/visualization/temporalgraph/temporal-drill-up.png
similarity index 100%
rename from productMods/images/visualization/temporalgraph/temporal-drill-up.png
rename to webapp/src/main/webapp/images/visualization/temporalgraph/temporal-drill-up.png
diff --git a/productMods/images/visualization/temporalgraph/temporal_graph_icon.png b/webapp/src/main/webapp/images/visualization/temporalgraph/temporal_graph_icon.png
similarity index 100%
rename from productMods/images/visualization/temporalgraph/temporal_graph_icon.png
rename to webapp/src/main/webapp/images/visualization/temporalgraph/temporal_graph_icon.png
diff --git a/productMods/images/visualization/temporalgraph/temporal_vis_placeholder.jpg b/webapp/src/main/webapp/images/visualization/temporalgraph/temporal_vis_placeholder.jpg
similarity index 100%
rename from productMods/images/visualization/temporalgraph/temporal_vis_placeholder.jpg
rename to webapp/src/main/webapp/images/visualization/temporalgraph/temporal_vis_placeholder.jpg
diff --git a/productMods/jenaIngest/ingestMenu.jsp b/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp
similarity index 100%
rename from productMods/jenaIngest/ingestMenu.jsp
rename to webapp/src/main/webapp/jenaIngest/ingestMenu.jsp
diff --git a/productMods/js/d3.min.js b/webapp/src/main/webapp/js/d3.min.js
similarity index 100%
rename from productMods/js/d3.min.js
rename to webapp/src/main/webapp/js/d3.min.js
diff --git a/productMods/js/homePageMaps.js b/webapp/src/main/webapp/js/homePageMaps.js
similarity index 100%
rename from productMods/js/homePageMaps.js
rename to webapp/src/main/webapp/js/homePageMaps.js
diff --git a/productMods/js/homePageUtils.js b/webapp/src/main/webapp/js/homePageUtils.js
similarity index 100%
rename from productMods/js/homePageUtils.js
rename to webapp/src/main/webapp/js/homePageUtils.js
diff --git a/productMods/js/individual/individualProfilePageType.js b/webapp/src/main/webapp/js/individual/individualProfilePageType.js
similarity index 100%
rename from productMods/js/individual/individualProfilePageType.js
rename to webapp/src/main/webapp/js/individual/individualProfilePageType.js
diff --git a/productMods/js/individual/individualQtipBubble.js b/webapp/src/main/webapp/js/individual/individualQtipBubble.js
similarity index 100%
rename from productMods/js/individual/individualQtipBubble.js
rename to webapp/src/main/webapp/js/individual/individualQtipBubble.js
diff --git a/productMods/js/individual/individualUtils.js b/webapp/src/main/webapp/js/individual/individualUtils.js
similarity index 100%
rename from productMods/js/individual/individualUtils.js
rename to webapp/src/main/webapp/js/individual/individualUtils.js
diff --git a/productMods/js/individual/propertyGroupControls.js b/webapp/src/main/webapp/js/individual/propertyGroupControls.js
similarity index 100%
rename from productMods/js/individual/propertyGroupControls.js
rename to webapp/src/main/webapp/js/individual/propertyGroupControls.js
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/css/demo_table.css b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/css/demo_table.css
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/css/demo_table.css
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/css/demo_table.css
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/css/demo_table_jui.css b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/css/demo_table_jui.css
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/css/demo_table_jui.css
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/css/demo_table_jui.css
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/Sorting icons.psd b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/Sorting icons.psd
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/Sorting icons.psd
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/Sorting icons.psd
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/back_disabled.jpg b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/back_disabled.jpg
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/back_disabled.jpg
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/back_disabled.jpg
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/back_enabled.jpg b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/back_enabled.jpg
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/back_enabled.jpg
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/back_enabled.jpg
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/favicon.ico b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/favicon.ico
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/favicon.ico
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/favicon.ico
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/forward_disabled.jpg b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/forward_disabled.jpg
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/forward_disabled.jpg
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/forward_disabled.jpg
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/forward_enabled.jpg b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/forward_enabled.jpg
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/forward_enabled.jpg
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/forward_enabled.jpg
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/sort_asc.png b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_asc.png
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/sort_asc.png
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_asc.png
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/sort_asc_disabled.png b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_asc_disabled.png
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/sort_asc_disabled.png
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_asc_disabled.png
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/sort_both.png b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_both.png
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/sort_both.png
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_both.png
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/sort_desc.png b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_desc.png
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/sort_desc.png
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_desc.png
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/images/sort_desc_disabled.png b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_desc_disabled.png
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/images/sort_desc_disabled.png
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/images/sort_desc_disabled.png
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.js
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.js
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.js
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js
diff --git a/productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js.gz b/webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js.gz
similarity index 100%
rename from productMods/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js.gz
rename to webapp/src/main/webapp/js/jquery_plugins/datatable/1.7.6/jquery.dataTables.min.js.gz
diff --git a/productMods/js/jquery_plugins/jquery.blockUI.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.blockUI.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.js
diff --git a/productMods/js/jquery_plugins/jquery.blockUI.min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.blockUI.min.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.blockUI.min.js
diff --git a/productMods/js/jquery_plugins/jquery.dataTables.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.dataTables.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.dataTables.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.dataTables.js
diff --git a/productMods/js/jquery_plugins/jquery.dataTables.min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.dataTables.min.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.dataTables.min.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.dataTables.min.js
diff --git a/productMods/js/jquery_plugins/jquery.notify.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.notify.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.notify.js
diff --git a/productMods/js/jquery_plugins/jquery.notify.min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.notify.min.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.notify.min.js
diff --git a/productMods/js/jquery_plugins/jquery.truncator.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js
similarity index 100%
rename from productMods/js/jquery_plugins/jquery.truncator.js
rename to webapp/src/main/webapp/js/jquery_plugins/jquery.truncator.js
diff --git a/productMods/js/latLongJson.js b/webapp/src/main/webapp/js/latLongJson.js
similarity index 100%
rename from productMods/js/latLongJson.js
rename to webapp/src/main/webapp/js/latLongJson.js
diff --git a/productMods/js/leaflet/LICENSE b/webapp/src/main/webapp/js/leaflet/LICENSE
similarity index 100%
rename from productMods/js/leaflet/LICENSE
rename to webapp/src/main/webapp/js/leaflet/LICENSE
diff --git a/productMods/js/leaflet/dist/images/layers.png b/webapp/src/main/webapp/js/leaflet/dist/images/layers.png
similarity index 100%
rename from productMods/js/leaflet/dist/images/layers.png
rename to webapp/src/main/webapp/js/leaflet/dist/images/layers.png
diff --git a/productMods/js/leaflet/dist/images/marker-icon.png b/webapp/src/main/webapp/js/leaflet/dist/images/marker-icon.png
similarity index 100%
rename from productMods/js/leaflet/dist/images/marker-icon.png
rename to webapp/src/main/webapp/js/leaflet/dist/images/marker-icon.png
diff --git a/productMods/js/leaflet/dist/images/marker-icon@2x.png b/webapp/src/main/webapp/js/leaflet/dist/images/marker-icon@2x.png
similarity index 100%
rename from productMods/js/leaflet/dist/images/marker-icon@2x.png
rename to webapp/src/main/webapp/js/leaflet/dist/images/marker-icon@2x.png
diff --git a/productMods/js/leaflet/dist/images/marker-shadow.png b/webapp/src/main/webapp/js/leaflet/dist/images/marker-shadow.png
similarity index 100%
rename from productMods/js/leaflet/dist/images/marker-shadow.png
rename to webapp/src/main/webapp/js/leaflet/dist/images/marker-shadow.png
diff --git a/productMods/js/leaflet/dist/leaflet-src.js b/webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js
similarity index 100%
rename from productMods/js/leaflet/dist/leaflet-src.js
rename to webapp/src/main/webapp/js/leaflet/dist/leaflet-src.js
diff --git a/productMods/js/leaflet/dist/leaflet.css b/webapp/src/main/webapp/js/leaflet/dist/leaflet.css
similarity index 100%
rename from productMods/js/leaflet/dist/leaflet.css
rename to webapp/src/main/webapp/js/leaflet/dist/leaflet.css
diff --git a/productMods/js/leaflet/dist/leaflet.ie.css b/webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css
similarity index 100%
rename from productMods/js/leaflet/dist/leaflet.ie.css
rename to webapp/src/main/webapp/js/leaflet/dist/leaflet.ie.css
diff --git a/productMods/js/leaflet/dist/leaflet.js b/webapp/src/main/webapp/js/leaflet/dist/leaflet.js
similarity index 100%
rename from productMods/js/leaflet/dist/leaflet.js
rename to webapp/src/main/webapp/js/leaflet/dist/leaflet.js
diff --git a/productMods/js/menupage/processDataGetterUtils.js b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
similarity index 100%
rename from productMods/js/menupage/processDataGetterUtils.js
rename to webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
diff --git a/productMods/js/menupage/processInternalClassDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js
similarity index 100%
rename from productMods/js/menupage/processInternalClassDataGetterContent.js
rename to webapp/src/main/webapp/js/menupage/processInternalClassDataGetterContent.js
diff --git a/productMods/js/visualization/coPIship/coPIship-person-level.js b/webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js
similarity index 100%
rename from productMods/js/visualization/coPIship/coPIship-person-level.js
rename to webapp/src/main/webapp/js/visualization/coPIship/coPIship-person-level.js
diff --git a/productMods/js/visualization/coauthorship/AC_OETags.js b/webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js
similarity index 100%
rename from productMods/js/visualization/coauthorship/AC_OETags.js
rename to webapp/src/main/webapp/js/visualization/coauthorship/AC_OETags.js
diff --git a/productMods/js/visualization/coauthorship/coauthorship-personlevel.js b/webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js
similarity index 100%
rename from productMods/js/visualization/coauthorship/coauthorship-personlevel.js
rename to webapp/src/main/webapp/js/visualization/coauthorship/coauthorship-personlevel.js
diff --git a/productMods/js/visualization/dataTables.helper.js b/webapp/src/main/webapp/js/visualization/dataTables.helper.js
similarity index 100%
rename from productMods/js/visualization/dataTables.helper.js
rename to webapp/src/main/webapp/js/visualization/dataTables.helper.js
diff --git a/productMods/js/visualization/entitycomparison/constants.js b/webapp/src/main/webapp/js/visualization/entitycomparison/constants.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/constants.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/constants.js
diff --git a/productMods/js/visualization/entitycomparison/gui-event-manager.js b/webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/gui-event-manager.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/Sorting icons.psd b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/Sorting icons.psd
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/Sorting icons.psd
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/Sorting icons.psd
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/back_disabled.jpg b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/back_disabled.jpg
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/back_disabled.jpg
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/back_disabled.jpg
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/back_enabled.jpg b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/back_enabled.jpg
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/back_enabled.jpg
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/back_enabled.jpg
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/favicon.ico b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/favicon.ico
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/favicon.ico
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/favicon.ico
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/forward_disabled.jpg b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/forward_disabled.jpg
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/forward_disabled.jpg
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/forward_disabled.jpg
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/forward_enabled.jpg b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/forward_enabled.jpg
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/forward_enabled.jpg
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/forward_enabled.jpg
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/question_mark_tooltip.jpg b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/question_mark_tooltip.jpg
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/question_mark_tooltip.jpg
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/question_mark_tooltip.jpg
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc.png b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc.png
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc.png
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc.png
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc_disabled.png b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc_disabled.png
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc_disabled.png
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_asc_disabled.png
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_both.png b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_both.png
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_both.png
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_both.png
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc.png b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc.png
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc.png
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc.png
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc_disabled.png b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc_disabled.png
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc_disabled.png
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/sort_desc_disabled.png
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.colorhelpers.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.crosshair.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.image.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.navigate.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.selection.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.stack.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.threshold.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.css
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jgrowl/jquery.jgrowl.js
diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js
diff --git a/productMods/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
similarity index 100%
rename from productMods/js/visualization/entitycomparison/util.js
rename to webapp/src/main/webapp/js/visualization/entitycomparison/util.js
diff --git a/productMods/js/visualization/mapofscience/ClassExtendUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ClassExtendUtils.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ClassExtendUtils.js
diff --git a/productMods/js/visualization/mapofscience/ColorStrategy.js b/webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ColorStrategy.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ColorStrategy.js
diff --git a/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ComparisonDataTableWidget.js
diff --git a/productMods/js/visualization/mapofscience/ComparisonScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ComparisonScimapWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ComparisonScimapWidget.js
diff --git a/productMods/js/visualization/mapofscience/ControlPanel.js b/webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ControlPanel.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ControlPanel.js
diff --git a/productMods/js/visualization/mapofscience/CustomMarker.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/CustomMarker.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/CustomMarker.js
diff --git a/productMods/js/visualization/mapofscience/CustomScimaps.js b/webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/CustomScimaps.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/CustomScimaps.js
diff --git a/productMods/js/visualization/mapofscience/DataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/DataTableWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/DataTableWidget.js
diff --git a/productMods/js/visualization/mapofscience/DownloadManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/DownloadManager.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/DownloadManager.js
diff --git a/productMods/js/visualization/mapofscience/EntityTablesWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/EntityTablesWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/EntityTablesWidget.js
diff --git a/productMods/js/visualization/mapofscience/ErrorDisplayWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ErrorDisplayWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ErrorDisplayWidget.js
diff --git a/productMods/js/visualization/mapofscience/GMapAPI.js b/webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/GMapAPI.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/GMapAPI.js
diff --git a/productMods/js/visualization/mapofscience/InitializeMap.js b/webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/InitializeMap.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/InitializeMap.js
diff --git a/productMods/js/visualization/mapofscience/Marker.js b/webapp/src/main/webapp/js/visualization/mapofscience/Marker.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/Marker.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/Marker.js
diff --git a/productMods/js/visualization/mapofscience/MarkerManager.js b/webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/MarkerManager.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/MarkerManager.js
diff --git a/productMods/js/visualization/mapofscience/NumberUtils.js b/webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/NumberUtils.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/NumberUtils.js
diff --git a/productMods/js/visualization/mapofscience/Polygon.js b/webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/Polygon.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/Polygon.js
diff --git a/productMods/js/visualization/mapofscience/ScimapWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/ScimapWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/ScimapWidget.js
diff --git a/productMods/js/visualization/mapofscience/SimpleDataTableWidget.js b/webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/SimpleDataTableWidget.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/SimpleDataTableWidget.js
diff --git a/productMods/js/visualization/mapofscience/SizeCoding.js b/webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/SizeCoding.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/SizeCoding.js
diff --git a/productMods/js/visualization/mapofscience/Tooltip.js b/webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/Tooltip.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/Tooltip.js
diff --git a/productMods/js/visualization/mapofscience/VisCommonControl.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/VisCommonControl.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/VisCommonControl.js
diff --git a/productMods/js/visualization/mapofscience/VisModeControllers.js b/webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js
similarity index 100%
rename from productMods/js/visualization/mapofscience/VisModeControllers.js
rename to webapp/src/main/webapp/js/visualization/mapofscience/VisModeControllers.js
diff --git a/productMods/js/visualization/personlevel/person-level.js b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js
similarity index 100%
rename from productMods/js/visualization/personlevel/person-level.js
rename to webapp/src/main/webapp/js/visualization/personlevel/person-level.js
diff --git a/productMods/js/visualization/sparkline.js b/webapp/src/main/webapp/js/visualization/sparkline.js
similarity index 100%
rename from productMods/js/visualization/sparkline.js
rename to webapp/src/main/webapp/js/visualization/sparkline.js
diff --git a/productMods/js/visualization/visualization-helper-functions.js b/webapp/src/main/webapp/js/visualization/visualization-helper-functions.js
similarity index 100%
rename from productMods/js/visualization/visualization-helper-functions.js
rename to webapp/src/main/webapp/js/visualization/visualization-helper-functions.js
diff --git a/productMods/robots.txt b/webapp/src/main/webapp/robots.txt
similarity index 100%
rename from productMods/robots.txt
rename to webapp/src/main/webapp/robots.txt
diff --git a/productMods/semantic.cache b/webapp/src/main/webapp/semantic.cache
similarity index 100%
rename from productMods/semantic.cache
rename to webapp/src/main/webapp/semantic.cache
diff --git a/productMods/templates/freemarker/body/aboutQrCodes.ftl b/webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/aboutQrCodes.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/aboutQrCodes.ftl
diff --git a/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl b/webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/foaf-person--exportQrCode.ftl
diff --git a/productMods/templates/freemarker/body/harvester/fileharvest.ftl b/webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/harvester/fileharvest.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/harvester/fileharvest.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-organization.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual--skos-concept.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual--skos-concept.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual--skos-concept.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual-openSocial.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual-openSocial.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual-openSocial.ftl
diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/individual.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
diff --git a/productMods/templates/freemarker/body/menupage/publications.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/menupage/publications.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/menupage/publications.ftl
diff --git a/productMods/templates/freemarker/body/orcid/orcidConfirm.ftl b/webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/orcid/orcidConfirm.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/orcid/orcidConfirm.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-altmetric.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-altmetric.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-altmetric.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-geographicFocus.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-iconControls.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-iconControls.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-iconControls.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-orcidInterface.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-overview.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-positions.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-researchAreas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-setup.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-setup.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-vocabularyService.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/individual-webpage.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-webpage.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-default.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-degreeEarned.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-doi.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-doi.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-doi.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-emailAddress.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAdministersGrant.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationAwardsGrant.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-phoneFaxNumber.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-preferredTitle.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publicationVenueFor.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-publisherOf.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
diff --git a/productMods/templates/freemarker/body/partials/shortview/view-browse-people.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/shortview/view-browse-people.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-browse-people.ftl
diff --git a/productMods/templates/freemarker/body/partials/shortview/view-index-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/shortview/view-index-default.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl
diff --git a/productMods/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/partials/shortview/view-search-default.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
diff --git a/productMods/templates/freemarker/body/search/search-csvResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/search/search-csvResults.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl
diff --git a/productMods/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl
similarity index 100%
rename from productMods/templates/freemarker/body/search/search-xmlResults.ftl
rename to webapp/src/main/webapp/templates/freemarker/body/search/search-xmlResults.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyCreateNew.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addConceptThroughObjectPropertyForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addFullNameToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addPublicationToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
diff --git a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
diff --git a/productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/css/addConcept.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/css/addConcept.css
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
diff --git a/productMods/templates/freemarker/edit/forms/css/autocomplete.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/css/autocomplete.css
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/css/autocomplete.css
diff --git a/productMods/templates/freemarker/edit/forms/css/institutionalInternalClass.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/css/institutionalInternalClass.css
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/css/institutionalInternalClass.css
diff --git a/productMods/templates/freemarker/edit/forms/css/manageDragDropList.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/css/manageDragDropList.css
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/css/manageDragDropList.css
diff --git a/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/grantAdministeredBy.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/grantAdministeredBy.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/grantAdministeredBy.ftl
diff --git a/productMods/templates/freemarker/edit/forms/grantHasContributor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/grantHasContributor.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/grantHasContributor.ftl
diff --git a/productMods/templates/freemarker/edit/forms/images/conceptCheckMark.png b/webapp/src/main/webapp/templates/freemarker/edit/forms/images/conceptCheckMark.png
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/images/conceptCheckMark.png
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/images/conceptCheckMark.png
diff --git a/productMods/templates/freemarker/edit/forms/images/conceptSpacer.png b/webapp/src/main/webapp/templates/freemarker/edit/forms/images/conceptSpacer.png
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/images/conceptSpacer.png
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/images/conceptSpacer.png
diff --git a/productMods/templates/freemarker/edit/forms/images/sortable_icon.png b/webapp/src/main/webapp/templates/freemarker/edit/forms/images/sortable_icon.png
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/images/sortable_icon.png
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/images/sortable_icon.png
diff --git a/productMods/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/institutionalInternalClassForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
diff --git a/productMods/templates/freemarker/edit/forms/js/addConcept.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/addConcept.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
diff --git a/productMods/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/addEditorsToInformationResource.js
diff --git a/productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/awardReceiptUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
diff --git a/productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/educationalTrainingUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/grantHasContributorUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/grantHasContributorUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/issuedCredentialUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/issuedCredentialUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/mailingAddressUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/manageHideShowStatus.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/manageHideShowStatus.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageHideShowStatus.js
diff --git a/productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
diff --git a/productMods/templates/freemarker/edit/forms/js/newIndividualFormUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/newIndividualFormUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/orgHasPositionUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/orgHasPositionUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/projectHasParticipantUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
diff --git a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
diff --git a/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
diff --git a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
diff --git a/productMods/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
diff --git a/productMods/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/newIndividualForm.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
diff --git a/productMods/templates/freemarker/edit/forms/organizationAdministersGrant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/organizationAdministersGrant.ftl
diff --git a/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/organizationForTraining.ftl
diff --git a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
diff --git a/productMods/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
diff --git a/productMods/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
diff --git a/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdviseeRelationship.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasAwardOrHonor.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasEmailAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasEmailAddress.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasEmailAddress.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPositionHistory.ftl
diff --git a/productMods/templates/freemarker/edit/forms/personHasPreferredTitle.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/personHasPreferredTitle.ftl
diff --git a/productMods/templates/freemarker/edit/forms/projectHasParticipant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/projectHasParticipant.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
diff --git a/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl
diff --git a/productMods/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
similarity index 100%
rename from productMods/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
rename to webapp/src/main/webapp/templates/freemarker/edit/forms/subjectHasPhoneFaxNumber.ftl
diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl
similarity index 100%
rename from productMods/templates/freemarker/lib/lib-home-page.ftl
rename to webapp/src/main/webapp/templates/freemarker/lib/lib-home-page.ftl
diff --git a/productMods/templates/freemarker/lib/lib-microformats.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
similarity index 100%
rename from productMods/templates/freemarker/lib/lib-microformats.ftl
rename to webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
diff --git a/productMods/templates/freemarker/lib/lib-vivo-form.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl
similarity index 100%
rename from productMods/templates/freemarker/lib/lib-vivo-form.ftl
rename to webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-form.ftl
diff --git a/productMods/templates/freemarker/lib/lib-vivo-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl
similarity index 100%
rename from productMods/templates/freemarker/lib/lib-vivo-properties.ftl
rename to webapp/src/main/webapp/templates/freemarker/lib/lib-vivo-properties.ftl
diff --git a/productMods/templates/freemarker/page/partials/geoFocusMapScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl
similarity index 100%
rename from productMods/templates/freemarker/page/partials/geoFocusMapScripts.ftl
rename to webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl
diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/collaboratorToActivityCountTable.ftl
diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/dummyVisClient.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/dummyVisClient.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/dummyVisClient.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl
diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/index.html b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/index.html
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/index.html
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/index.html
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/sampleData.json b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/sampleData.json
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/sampleData.json
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/sampleData.json
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/smallSampleData.json b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/smallSampleData.json
similarity index 100%
rename from productMods/templates/freemarker/visualization/mapOfScience/smallSampleData.json
rename to webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/smallSampleData.json
diff --git a/productMods/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/modelconstructor/regenerateConstructedModels.ftl
diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl
diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
diff --git a/productMods/templates/freemarker/visualization/tools.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/tools.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/tools.ftl
diff --git a/productMods/templates/freemarker/visualization/utilities.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/utilities.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/utilities.ftl
diff --git a/productMods/templates/freemarker/visualization/visualizationError.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/visualizationError.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/visualizationError.ftl
diff --git a/productMods/templates/freemarker/visualization/yearToActivityCountTable.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl
similarity index 100%
rename from productMods/templates/freemarker/visualization/yearToActivityCountTable.ftl
rename to webapp/src/main/webapp/templates/freemarker/visualization/yearToActivityCountTable.ftl
diff --git a/themes/wilma/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
similarity index 100%
rename from themes/wilma/css/openSocial/gadgets.css
rename to webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
diff --git a/themes/wilma/css/reset.css b/webapp/src/main/webapp/themes/wilma/css/reset.css
similarity index 100%
rename from themes/wilma/css/reset.css
rename to webapp/src/main/webapp/themes/wilma/css/reset.css
diff --git a/themes/wilma/css/screen.css b/webapp/src/main/webapp/themes/wilma/css/screen.css
similarity index 100%
rename from themes/wilma/css/screen.css
rename to webapp/src/main/webapp/themes/wilma/css/screen.css
diff --git a/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css
similarity index 100%
rename from themes/wilma/css/wilma.css
rename to webapp/src/main/webapp/themes/wilma/css/wilma.css
diff --git a/themes/wilma/i18n/all.properties b/webapp/src/main/webapp/themes/wilma/i18n/all.properties
similarity index 100%
rename from themes/wilma/i18n/all.properties
rename to webapp/src/main/webapp/themes/wilma/i18n/all.properties
diff --git a/themes/wilma/i18n/images/select_locale_en_US.GIF b/webapp/src/main/webapp/themes/wilma/i18n/images/select_locale_en_US.GIF
similarity index 100%
rename from themes/wilma/i18n/images/select_locale_en_US.GIF
rename to webapp/src/main/webapp/themes/wilma/i18n/images/select_locale_en_US.GIF
diff --git a/themes/wilma/images/VIVO-logo.png b/webapp/src/main/webapp/themes/wilma/images/VIVO-logo.png
similarity index 100%
rename from themes/wilma/images/VIVO-logo.png
rename to webapp/src/main/webapp/themes/wilma/images/VIVO-logo.png
diff --git a/themes/wilma/images/addNewAccount.png b/webapp/src/main/webapp/themes/wilma/images/addNewAccount.png
similarity index 100%
rename from themes/wilma/images/addNewAccount.png
rename to webapp/src/main/webapp/themes/wilma/images/addNewAccount.png
diff --git a/themes/wilma/images/addNewAccountOver.png b/webapp/src/main/webapp/themes/wilma/images/addNewAccountOver.png
similarity index 100%
rename from themes/wilma/images/addNewAccountOver.png
rename to webapp/src/main/webapp/themes/wilma/images/addNewAccountOver.png
diff --git a/themes/wilma/images/alert-overlay.png b/webapp/src/main/webapp/themes/wilma/images/alert-overlay.png
similarity index 100%
rename from themes/wilma/images/alert-overlay.png
rename to webapp/src/main/webapp/themes/wilma/images/alert-overlay.png
diff --git a/themes/wilma/images/arrow-down-account.gif b/webapp/src/main/webapp/themes/wilma/images/arrow-down-account.gif
similarity index 100%
rename from themes/wilma/images/arrow-down-account.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow-down-account.gif
diff --git a/themes/wilma/images/arrow-down-over-account.gif b/webapp/src/main/webapp/themes/wilma/images/arrow-down-over-account.gif
similarity index 100%
rename from themes/wilma/images/arrow-down-over-account.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow-down-over-account.gif
diff --git a/themes/wilma/images/arrow-green.gif b/webapp/src/main/webapp/themes/wilma/images/arrow-green.gif
similarity index 100%
rename from themes/wilma/images/arrow-green.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow-green.gif
diff --git a/themes/wilma/images/arrow-grey.gif b/webapp/src/main/webapp/themes/wilma/images/arrow-grey.gif
similarity index 100%
rename from themes/wilma/images/arrow-grey.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow-grey.gif
diff --git a/themes/wilma/images/arrow-menu-account.gif b/webapp/src/main/webapp/themes/wilma/images/arrow-menu-account.gif
similarity index 100%
rename from themes/wilma/images/arrow-menu-account.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow-menu-account.gif
diff --git a/themes/wilma/images/arrow.gif b/webapp/src/main/webapp/themes/wilma/images/arrow.gif
similarity index 100%
rename from themes/wilma/images/arrow.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrow.gif
diff --git a/themes/wilma/images/arrowSmall.gif b/webapp/src/main/webapp/themes/wilma/images/arrowSmall.gif
similarity index 100%
rename from themes/wilma/images/arrowSmall.gif
rename to webapp/src/main/webapp/themes/wilma/images/arrowSmall.gif
diff --git a/themes/wilma/images/filteredSearch.gif b/webapp/src/main/webapp/themes/wilma/images/filteredSearch.gif
similarity index 100%
rename from themes/wilma/images/filteredSearch.gif
rename to webapp/src/main/webapp/themes/wilma/images/filteredSearch.gif
diff --git a/themes/wilma/images/filteredSearchActive.gif b/webapp/src/main/webapp/themes/wilma/images/filteredSearchActive.gif
similarity index 100%
rename from themes/wilma/images/filteredSearchActive.gif
rename to webapp/src/main/webapp/themes/wilma/images/filteredSearchActive.gif
diff --git a/themes/wilma/images/green_minus_sign.gif b/webapp/src/main/webapp/themes/wilma/images/green_minus_sign.gif
similarity index 100%
rename from themes/wilma/images/green_minus_sign.gif
rename to webapp/src/main/webapp/themes/wilma/images/green_minus_sign.gif
diff --git a/themes/wilma/images/green_plus_sign.gif b/webapp/src/main/webapp/themes/wilma/images/green_plus_sign.gif
similarity index 100%
rename from themes/wilma/images/green_plus_sign.gif
rename to webapp/src/main/webapp/themes/wilma/images/green_plus_sign.gif
diff --git a/themes/wilma/images/header-background.jpg b/webapp/src/main/webapp/themes/wilma/images/header-background.jpg
similarity index 100%
rename from themes/wilma/images/header-background.jpg
rename to webapp/src/main/webapp/themes/wilma/images/header-background.jpg
diff --git a/themes/wilma/images/header-background.png b/webapp/src/main/webapp/themes/wilma/images/header-background.png
similarity index 100%
rename from themes/wilma/images/header-background.png
rename to webapp/src/main/webapp/themes/wilma/images/header-background.png
diff --git a/themes/wilma/images/jump-tp-property-group-menu.gif b/webapp/src/main/webapp/themes/wilma/images/jump-tp-property-group-menu.gif
similarity index 100%
rename from themes/wilma/images/jump-tp-property-group-menu.gif
rename to webapp/src/main/webapp/themes/wilma/images/jump-tp-property-group-menu.gif
diff --git a/themes/wilma/images/openSocial/icon_squareArrow.gif b/webapp/src/main/webapp/themes/wilma/images/openSocial/icon_squareArrow.gif
similarity index 100%
rename from themes/wilma/images/openSocial/icon_squareArrow.gif
rename to webapp/src/main/webapp/themes/wilma/images/openSocial/icon_squareArrow.gif
diff --git a/themes/wilma/images/openSocial/icon_squareDownArrow.gif b/webapp/src/main/webapp/themes/wilma/images/openSocial/icon_squareDownArrow.gif
similarity index 100%
rename from themes/wilma/images/openSocial/icon_squareDownArrow.gif
rename to webapp/src/main/webapp/themes/wilma/images/openSocial/icon_squareDownArrow.gif
diff --git a/themes/wilma/images/pointToCropPreview.jpg b/webapp/src/main/webapp/themes/wilma/images/pointToCropPreview.jpg
similarity index 100%
rename from themes/wilma/images/pointToCropPreview.jpg
rename to webapp/src/main/webapp/themes/wilma/images/pointToCropPreview.jpg
diff --git a/themes/wilma/images/search-field-and-button.gif b/webapp/src/main/webapp/themes/wilma/images/search-field-and-button.gif
similarity index 100%
rename from themes/wilma/images/search-field-and-button.gif
rename to webapp/src/main/webapp/themes/wilma/images/search-field-and-button.gif
diff --git a/themes/wilma/images/search-interior-pages.gif b/webapp/src/main/webapp/themes/wilma/images/search-interior-pages.gif
similarity index 100%
rename from themes/wilma/images/search-interior-pages.gif
rename to webapp/src/main/webapp/themes/wilma/images/search-interior-pages.gif
diff --git a/themes/wilma/images/search-interior-pages.png b/webapp/src/main/webapp/themes/wilma/images/search-interior-pages.png
similarity index 100%
rename from themes/wilma/images/search-interior-pages.png
rename to webapp/src/main/webapp/themes/wilma/images/search-interior-pages.png
diff --git a/themes/wilma/images/selected-main-nav.jpg b/webapp/src/main/webapp/themes/wilma/images/selected-main-nav.jpg
similarity index 100%
rename from themes/wilma/images/selected-main-nav.jpg
rename to webapp/src/main/webapp/themes/wilma/images/selected-main-nav.jpg
diff --git a/themes/wilma/images/separator-main-nav.jpg b/webapp/src/main/webapp/themes/wilma/images/separator-main-nav.jpg
similarity index 100%
rename from themes/wilma/images/separator-main-nav.jpg
rename to webapp/src/main/webapp/themes/wilma/images/separator-main-nav.jpg
diff --git a/themes/wilma/images/separator-property-group-nav.jpg b/webapp/src/main/webapp/themes/wilma/images/separator-property-group-nav.jpg
similarity index 100%
rename from themes/wilma/images/separator-property-group-nav.jpg
rename to webapp/src/main/webapp/themes/wilma/images/separator-property-group-nav.jpg
diff --git a/themes/wilma/images/sort-asc.gif b/webapp/src/main/webapp/themes/wilma/images/sort-asc.gif
similarity index 100%
rename from themes/wilma/images/sort-asc.gif
rename to webapp/src/main/webapp/themes/wilma/images/sort-asc.gif
diff --git a/themes/wilma/images/sort-desc.gif b/webapp/src/main/webapp/themes/wilma/images/sort-desc.gif
similarity index 100%
rename from themes/wilma/images/sort-desc.gif
rename to webapp/src/main/webapp/themes/wilma/images/sort-desc.gif
diff --git a/themes/wilma/images/stats-bg.png b/webapp/src/main/webapp/themes/wilma/images/stats-bg.png
similarity index 100%
rename from themes/wilma/images/stats-bg.png
rename to webapp/src/main/webapp/themes/wilma/images/stats-bg.png
diff --git a/themes/wilma/templates/footer.ftl b/webapp/src/main/webapp/themes/wilma/templates/footer.ftl
similarity index 100%
rename from themes/wilma/templates/footer.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/footer.ftl
diff --git a/themes/wilma/templates/gadgetDetails.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl
similarity index 100%
rename from themes/wilma/templates/gadgetDetails.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/gadgetDetails.ftl
diff --git a/themes/wilma/templates/gadgetLogin.ftl b/webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl
similarity index 100%
rename from themes/wilma/templates/gadgetLogin.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/gadgetLogin.ftl
diff --git a/themes/wilma/templates/googleAnalytics.ftl b/webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl
similarity index 100%
rename from themes/wilma/templates/googleAnalytics.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/googleAnalytics.ftl
diff --git a/themes/wilma/templates/head.ftl b/webapp/src/main/webapp/themes/wilma/templates/head.ftl
similarity index 100%
rename from themes/wilma/templates/head.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/head.ftl
diff --git a/themes/wilma/templates/identity.ftl b/webapp/src/main/webapp/themes/wilma/templates/identity.ftl
similarity index 100%
rename from themes/wilma/templates/identity.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/identity.ftl
diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
similarity index 100%
rename from themes/wilma/templates/individual--foaf-person.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
diff --git a/themes/wilma/templates/menu.ftl b/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
similarity index 100%
rename from themes/wilma/templates/menu.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/menu.ftl
diff --git a/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
similarity index 100%
rename from themes/wilma/templates/page-home.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
diff --git a/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl
similarity index 100%
rename from themes/wilma/templates/page.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/page.ftl
diff --git a/themes/wilma/templates/search.ftl b/webapp/src/main/webapp/themes/wilma/templates/search.ftl
similarity index 100%
rename from themes/wilma/templates/search.ftl
rename to webapp/src/main/webapp/themes/wilma/templates/search.ftl