diff --git a/cave/com.raytheon.uf.viz.alertviz/.classpath b/cave/com.raytheon.uf.viz.alertviz/.classpath
index ae7075886e..1fa3e6803d 100644
--- a/cave/com.raytheon.uf.viz.alertviz/.classpath
+++ b/cave/com.raytheon.uf.viz.alertviz/.classpath
@@ -3,7 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/derbyrun.jar" sourcepath="com.raytheon.uf.viz.alertvizsrc.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/derby.jar" sourcepath="com.raytheon.uf.viz.alertvizsrc.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF
index 4f5ed9299a..ebb46adcc9 100644
--- a/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF
@@ -17,9 +17,7 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.common.alertviz,
  javax.jms;bundle-version="1.0.0",
  ch.qos.logback;bundle-version="1.0.13"
-Bundle-ClassPath: .,
- lib/derbyrun.jar,
- lib/derby.jar
+Bundle-ClassPath: .
 Export-Package: com.raytheon.uf.viz.alertviz,
  com.raytheon.uf.viz.alertviz.config
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cave/com.raytheon.uf.viz.alertviz/build.properties b/cave/com.raytheon.uf.viz.alertviz/build.properties
index bf04d95cd1..b85c8133f9 100644
--- a/cave/com.raytheon.uf.viz.alertviz/build.properties
+++ b/cave/com.raytheon.uf.viz.alertviz/build.properties
@@ -3,8 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               lib/derbyrun.jar,\
-               lib/derby.jar,\
                statusMessage.xsd,\
                config.xml,\
                log4j-alertviz.xml
diff --git a/cave/com.raytheon.uf.viz.alertviz/lib/derby.jar b/cave/com.raytheon.uf.viz.alertviz/lib/derby.jar
deleted file mode 100644
index 82e06335d7..0000000000
Binary files a/cave/com.raytheon.uf.viz.alertviz/lib/derby.jar and /dev/null differ
diff --git a/cave/com.raytheon.uf.viz.cots.feature/feature.xml b/cave/com.raytheon.uf.viz.cots.feature/feature.xml
index a99fb60162..65244a65cc 100644
--- a/cave/com.raytheon.uf.viz.cots.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.cots.feature/feature.xml
@@ -75,4 +75,10 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.derby"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
index 52c57cf4a2..b76cbd30ee 100644
--- a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
+++ b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
@@ -479,4 +479,10 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.derby"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/cots/org.apache.derby/.classpath b/cots/org.apache.derby/.classpath
new file mode 100644
index 0000000000..176203b41e
--- /dev/null
+++ b/cots/org.apache.derby/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="derby.jar"/>
+	<classpathentry exported="true" kind="lib" path="derbyrun.jar"/>
+	<classpathentry exported="true" kind="lib" path="derbytools.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cots/org.apache.derby/.project b/cots/org.apache.derby/.project
new file mode 100644
index 0000000000..aed71698b9
--- /dev/null
+++ b/cots/org.apache.derby/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.derby</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/cots/org.apache.derby/.settings/org.eclipse.jdt.core.prefs b/cots/org.apache.derby/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c537b63063
--- /dev/null
+++ b/cots/org.apache.derby/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/cots/org.apache.derby/META-INF/MANIFEST.MF b/cots/org.apache.derby/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..a5de5a7e15
--- /dev/null
+++ b/cots/org.apache.derby/META-INF/MANIFEST.MF
@@ -0,0 +1,115 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Derby
+Bundle-SymbolicName: org.apache.derby
+Bundle-Version: 10.10.1.1
+Bundle-ClassPath: derby.jar,
+ derbyrun.jar,
+ derbytools.jar
+Bundle-Vendor: Apache
+Export-Package: org.apache.derby.agg,
+ org.apache.derby.authentication,
+ org.apache.derby.catalog,
+ org.apache.derby.catalog.types,
+ org.apache.derby.database,
+ org.apache.derby.diag,
+ org.apache.derby.iapi.db,
+ org.apache.derby.iapi.error,
+ org.apache.derby.iapi.jdbc,
+ org.apache.derby.iapi.reference,
+ org.apache.derby.iapi.security,
+ org.apache.derby.iapi.services.cache,
+ org.apache.derby.iapi.services.classfile,
+ org.apache.derby.iapi.services.compiler,
+ org.apache.derby.iapi.services.context,
+ org.apache.derby.iapi.services.crypto,
+ org.apache.derby.iapi.services.daemon,
+ org.apache.derby.iapi.services.diag,
+ org.apache.derby.iapi.services.i18n,
+ org.apache.derby.iapi.services.info,
+ org.apache.derby.iapi.services.io,
+ org.apache.derby.iapi.services.jmx,
+ org.apache.derby.iapi.services.loader,
+ org.apache.derby.iapi.services.locks,
+ org.apache.derby.iapi.services.memory,
+ org.apache.derby.iapi.services.monitor,
+ org.apache.derby.iapi.services.property,
+ org.apache.derby.iapi.services.stream,
+ org.apache.derby.iapi.services.timer,
+ org.apache.derby.iapi.services.uuid,
+ org.apache.derby.iapi.sql,
+ org.apache.derby.iapi.sql.compile,
+ org.apache.derby.iapi.sql.conn,
+ org.apache.derby.iapi.sql.depend,
+ org.apache.derby.iapi.sql.dictionary,
+ org.apache.derby.iapi.sql.execute,
+ org.apache.derby.iapi.sql.execute.xplain,
+ org.apache.derby.iapi.store.access,
+ org.apache.derby.iapi.store.access.conglomerate,
+ org.apache.derby.iapi.store.access.xa,
+ org.apache.derby.iapi.store.raw,
+ org.apache.derby.iapi.store.raw.data,
+ org.apache.derby.iapi.store.raw.log,
+ org.apache.derby.iapi.store.raw.xact,
+ org.apache.derby.iapi.store.replication.master,
+ org.apache.derby.iapi.store.replication.slave,
+ org.apache.derby.iapi.tools,
+ org.apache.derby.iapi.tools.i18n,
+ org.apache.derby.iapi.types,
+ org.apache.derby.iapi.util,
+ org.apache.derby.impl.db,
+ org.apache.derby.impl.io,
+ org.apache.derby.impl.io.vfmem,
+ org.apache.derby.impl.jdbc,
+ org.apache.derby.impl.jdbc.authentication,
+ org.apache.derby.impl.load,
+ org.apache.derby.impl.services.bytecode,
+ org.apache.derby.impl.services.cache,
+ org.apache.derby.impl.services.daemon,
+ org.apache.derby.impl.services.jce,
+ org.apache.derby.impl.services.jmx,
+ org.apache.derby.impl.services.jmxnone,
+ org.apache.derby.impl.services.locks,
+ org.apache.derby.impl.services.monitor,
+ org.apache.derby.impl.services.reflect,
+ org.apache.derby.impl.services.stream,
+ org.apache.derby.impl.services.timer,
+ org.apache.derby.impl.services.uuid,
+ org.apache.derby.impl.sql,
+ org.apache.derby.impl.sql.catalog,
+ org.apache.derby.impl.sql.compile,
+ org.apache.derby.impl.sql.conn,
+ org.apache.derby.impl.sql.depend,
+ org.apache.derby.impl.sql.execute,
+ org.apache.derby.impl.sql.execute.rts,
+ org.apache.derby.impl.sql.execute.xplain,
+ org.apache.derby.impl.store.access,
+ org.apache.derby.impl.store.access.btree,
+ org.apache.derby.impl.store.access.btree.index,
+ org.apache.derby.impl.store.access.conglomerate,
+ org.apache.derby.impl.store.access.heap,
+ org.apache.derby.impl.store.access.sort,
+ org.apache.derby.impl.store.raw,
+ org.apache.derby.impl.store.raw.data,
+ org.apache.derby.impl.store.raw.log,
+ org.apache.derby.impl.store.raw.xact,
+ org.apache.derby.impl.store.replication,
+ org.apache.derby.impl.store.replication.buffer,
+ org.apache.derby.impl.store.replication.master,
+ org.apache.derby.impl.store.replication.net,
+ org.apache.derby.impl.store.replication.slave,
+ org.apache.derby.impl.tools.dblook,
+ org.apache.derby.impl.tools.ij,
+ org.apache.derby.impl.tools.optional,
+ org.apache.derby.impl.tools.planexporter,
+ org.apache.derby.impl.tools.sysinfo,
+ org.apache.derby.io,
+ org.apache.derby.jdbc,
+ org.apache.derby.mbeans,
+ org.apache.derby.osgi,
+ org.apache.derby.security,
+ org.apache.derby.shared.common.error,
+ org.apache.derby.shared.common.reference,
+ org.apache.derby.tools,
+ org.apache.derby.vti
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cots/org.apache.derby/build.properties b/cots/org.apache.derby/build.properties
new file mode 100644
index 0000000000..2c26d8e90f
--- /dev/null
+++ b/cots/org.apache.derby/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               derby.jar,\
+               derbyrun.jar,\
+               derbytools.jar
diff --git a/cots/org.apache.derby/derby.jar b/cots/org.apache.derby/derby.jar
new file mode 100644
index 0000000000..32804ebbe6
Binary files /dev/null and b/cots/org.apache.derby/derby.jar differ
diff --git a/cave/com.raytheon.uf.viz.alertviz/lib/derbyrun.jar b/cots/org.apache.derby/derbyrun.jar
similarity index 88%
rename from cave/com.raytheon.uf.viz.alertviz/lib/derbyrun.jar
rename to cots/org.apache.derby/derbyrun.jar
index 34b46559e3..781f0914e5 100644
Binary files a/cave/com.raytheon.uf.viz.alertviz/lib/derbyrun.jar and b/cots/org.apache.derby/derbyrun.jar differ
diff --git a/cots/org.apache.derby/derbytools.jar b/cots/org.apache.derby/derbytools.jar
new file mode 100644
index 0000000000..c1c6331546
Binary files /dev/null and b/cots/org.apache.derby/derbytools.jar differ