diff --git a/example.deploy.properties b/example.deploy.properties
index aaf87500..74585c6d 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -63,26 +63,15 @@ email.replyTo =
 #
 # The basic parameters for a database connection. Change the end of the 
 # URL to reflect your database name (if it is not "vitro"). Change the username 
-# and password to match the authorized database user you created. Increase the
-# maximum size of the database connection pool if you need to serve a greater
-# number of concurrent page requests.
+# and password to match the authorized database user you created.
 #
 VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb
 VitroConnection.DataSource.username = vitrodbUsername
 VitroConnection.DataSource.password = vitrodbPassword
 
-#
-# The Jena triple store technology to use.  SDB is Jena's SPARQL database;
-# this setting allows RDF data to scale beyond the limits of the JVM heap.
-# Set to RDB to use the older Jena RDB store with in-memory caching. 
-#
-VitroConnection.DataSource.tripleStoreType = RDB
-
 #
 # The maximum number of active connections in the database connection pool.
-# Increase this value to support a greater number of concurrent page requests
-# with SDB.  It is not necessary to adjust this value when using the
-# RDB configuration.
+# Increase this value to support a greater number of concurrent page requests.
 #
 VitroConnection.DataSource.pool.maxActive = 40
 
diff --git a/productMods/WEB-INF/ontologies/user/geopolitical-1.1-individual-labels.rdf b/productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/geopolitical-1.1-individual-labels.rdf
rename to productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf
diff --git a/productMods/WEB-INF/ontologies/user/classgroups.rdf b/productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/classgroups.rdf
rename to productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf
diff --git a/productMods/WEB-INF/ontologies/user/propertygroups.rdf b/productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/propertygroups.rdf
rename to productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf
diff --git a/productMods/WEB-INF/ontologies/user/geopolitical-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/geopolitical-1.1-annotations.rdf
rename to productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/user/scires-1.3-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/scires-1.3-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/scires-1.3-annotations.rdf
rename to productMods/WEB-INF/ontologies/user/tbox/scires-1.3-annotations.rdf
diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.3-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf
similarity index 100%
rename from productMods/WEB-INF/ontologies/user/vivo-core-1.3-annotations.rdf
rename to productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf