diff --git a/.gitignore b/.gitignore
index c521386..f79bd1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# generated directories
java/build/
java/src/main/webapp
+java/vospace-2.0.war
# local env settings
.env
diff --git a/java/log4j.xml.dldb1 b/java/log4j.xml.dldb1
deleted file mode 100644
index da1bb1c..0000000
--- a/java/log4j.xml.dldb1
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/log4j.xml.gp04 b/java/log4j.xml.gp04
deleted file mode 100644
index da1bb1c..0000000
--- a/java/log4j.xml.gp04
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/log4j.xml.vostest b/java/log4j.xml.vostest
deleted file mode 100644
index 5f49129..0000000
--- a/java/log4j.xml.vostest
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java/vospace.properties.dldb1 b/java/vospace.properties.dldb1
deleted file mode 100644
index 8b253d6..0000000
--- a/java/vospace.properties.dldb1
+++ /dev/null
@@ -1,70 +0,0 @@
-# Properties file for VOSpace
-# Version: 03/28/2017
-# Metadata store
-store.type=mysql
-store.type.virtuoso=edu.caltech.vao.vospace.meta.VirtuosoMetaStore
-store.type.mysql=edu.caltech.vao.vospace.meta.MySQLMetaStore
-
-# Backend storage
-backend.type=localfs
-backend.type.localfs=edu.caltech.vao.vospace.storage.LocalFSStorageManager
-backend.type.swift=edu.caltech.vao.vospace.storage.SwiftStorageManager
-
-# External address of HTTP data server
-server.http.url=http://dldb1.datalab.noirlab.edu:8080/vospace-2.0/vospace/data
-
-# External address of transfers endpoint
-server.transfer.url=http://dldb1.datalab.noirlab.edu:8080/vospace-2.0/vospace/transfers
-
-# External address of Datalab Authentication service
-server.auth.url=https://datalab.noirlab.edu/auth
-
-# Root directory for HTTP data server (should be same as space.baseuri without file:// scheme identifier)
-server.http.basedir=/net/dl2/vospace/users
-server.meta.dburl=localhost/vospace_prd
-
-# Username for db access
-server.meta.dbuid=dba
-# Password for db access
-server.meta.dbpwd=dba
-# Port the service will run on
-server.space.port=8080
-space.supports.structure=true
-# Root directory for the service storage
-space.baseuri=file:///net/dl2/vospace/users
-# Staging area for format conversions
-space.staging_area=file:///net/dl2/vospace/tmp
-# IVOA identifer for the service
-space.identifier=ivo://datalab.noirlab/vospace
-# VOSpace identifier for the root node
-space.rootnode=vos://datalab.noirlab!vospace
-
-# Formats
-space.accepts.image=PNG, JPEG, FITS
-space.accepts.table=VOTABLE, FITS_TABLE
-space.accepts.archive=TAR
-space.accepts.other=ASCII
-space.provides.image=PNG, JPEG, FITS
-space.provides.table=VOTABLE, FITS_TABLE
-space.provides.archive=TAR
-space.provides.other=ASCII
-
-# Protocols
-space.protocol.client=http-get, http-put
-space.protocol.server=http-get, http-put
-space.protocol.handler.http-get=edu.caltech.vao.vospace.protocol.HttpGetProtocolHandler
-space.protocol.handler.http-put=edu.caltech.vao.vospace.protocol.HttpPutProtocolHandler
-
-# IVOA base identifier for capabilities
-space.capability.baseivorn = ivo://datalab.noirlab/vospace/capabilities
-
-# Capabilities
-space.capability.exe=/home/graham/capRunner.py
-space.capability.port=20001
-space.capabilities=runner,tableingester,downloader
-space.capability.runner=edu.caltech.vao.vospace.capability.CapRunner
-space.capability.runner.port=20001
-space.capability.tableingester=edu.caltech.vao.vospace.capability.TableIngester
-
-# Properties for logging
-# look for log4j.xml
diff --git a/java/vospace.properties.dldev b/java/vospace.properties.dldev
deleted file mode 100644
index b339eb1..0000000
--- a/java/vospace.properties.dldev
+++ /dev/null
@@ -1,80 +0,0 @@
-# Properties file for VOSpace
-# Version: 03/28/2017
-# Metadata store
-store.type=mysql
-store.type.virtuoso=edu.caltech.vao.vospace.meta.VirtuosoMetaStore
-store.type.mysql=edu.caltech.vao.vospace.meta.MySQLMetaStore
-
-# Backend storage
-backend.type=localfs
-backend.type.localfs=edu.caltech.vao.vospace.storage.LocalFSStorageManager
-backend.type.swift=edu.caltech.vao.vospace.storage.SwiftStorageManager
-
-# External address of HTTP data server
-server.http.url=http://dldev.datalab.noao.edu:8080/vospace-2.0/vospace/data
-
-# External address of transfers endpoint
-#server.transfer.url=http://dldb1.sdm.noao.edu:8080/vospace-2.0/vospace/transfers
-server.transfer.url=http://dldev.datalab.noao.edu:8080/vospace-2.0/vospace/transfers
-
-# External address of Datalab Authentication service
-#server.auth.url=http://dlsvcs.datalab.noao.edu/auth/
-server.auth.url=http://dldev.datalab.noao.edu/auth/
-
-# Root directory for HTTP data server (should be same as space.baseuri without file:// scheme identifier)
-server.http.basedir=/data/vospace/users
-server.meta.dburl=gp05.datalab.noao.edu/vospace_dev
-
-# Username for db access
-server.meta.dbuid=dba
-# Password for db access
-server.meta.dbpwd=dba
-# Port the service will run on
-server.space.port=8080
-space.supports.structure=true
-# Root directory for the service storage
-space.baseuri=file:///data/vospace/users
-# Staging area for format conversions
-space.staging_area=file:///data/vospace/tmp
-# IVOA identifer for the service
-space.identifier=ivo://datalab.noao/vospace
-# VOSpace identifier for the root node
-space.rootnode=vos://datalab.noao!vospace
-
-# Formats
-space.accepts.image=PNG, JPEG, FITS
-space.accepts.table=VOTABLE, FITS_TABLE
-space.accepts.archive=TAR
-space.accepts.other=ASCII
-space.provides.image=PNG, JPEG, FITS
-space.provides.table=VOTABLE, FITS_TABLE
-space.provides.archive=TAR
-space.provides.other=ASCII
-
-# Protocols
-space.protocol.client=http-get, http-put
-space.protocol.server=http-get, http-put
-space.protocol.handler.http-get=edu.caltech.vao.vospace.protocol.HttpGetProtocolHandler
-space.protocol.handler.http-put=edu.caltech.vao.vospace.protocol.HttpPutProtocolHandler
-
-# IVOA base identifier for capabilities
-space.capability.baseivorn = ivo://datalab.noao/vospace/capabilities
-
-# Capabilities
-space.capability.exe=/home/graham/capRunner.py
-space.capability.port=20001
-space.capabilities=runner,tableingester,downloader
-space.capability.runner=edu.caltech.vao.vospace.capability.CapRunner
-space.capability.runner.port=20001
-space.capability.tableingester=edu.caltech.vao.vospace.capability.TableIngester
-
-# Properties for logging
-log4j.rootLogger = info, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logfile.File=vospace.log
-log4j.appender.logfile.DatePattern='.'yyyy-ww
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
diff --git a/java/vospace.properties.dltest b/java/vospace.properties.dltest
deleted file mode 100644
index 9ab1702..0000000
--- a/java/vospace.properties.dltest
+++ /dev/null
@@ -1,80 +0,0 @@
-# Properties file for VOSpace
-# Version: 03/28/2017
-# Metadata store
-store.type=mysql
-store.type.virtuoso=edu.caltech.vao.vospace.meta.VirtuosoMetaStore
-store.type.mysql=edu.caltech.vao.vospace.meta.MySQLMetaStore
-
-# Backend storage
-backend.type=localfs
-backend.type.localfs=edu.caltech.vao.vospace.storage.LocalFSStorageManager
-backend.type.swift=edu.caltech.vao.vospace.storage.SwiftStorageManager
-
-# External address of HTTP data server
-server.http.url=http://dltest.datalab.noao.edu:8080/vospace-2.0/vospace/data
-
-# External address of transfers endpoint
-#server.transfer.url=http://dldb1.sdm.noao.edu:8080/vospace-2.0/vospace/transfers
-server.transfer.url=http://dltest.datalab.noao.edu:8080/vospace-2.0/vospace/transfers
-
-# External address of Datalab Authentication service
-#server.auth.url=http://dlsvcs.datalab.noao.edu/auth/
-server.auth.url=http://dltest.datalab.noao.edu/auth/
-
-# Root directory for HTTP data server (should be same as space.baseuri without file:// scheme identifier)
-server.http.basedir=/data/vospace/users
-server.meta.dburl=gp05.datalab.noao.edu/vospace_test
-
-# Username for db access
-server.meta.dbuid=dba
-# Password for db access
-server.meta.dbpwd=dba
-# Port the service will run on
-server.space.port=8080
-space.supports.structure=true
-# Root directory for the service storage
-space.baseuri=file:///data/vospace/users
-# Staging area for format conversions
-space.staging_area=file:///data/vospace/tmp
-# IVOA identifer for the service
-space.identifier=ivo://datalab.noao/vospace
-# VOSpace identifier for the root node
-space.rootnode=vos://datalab.noao!vospace
-
-# Formats
-space.accepts.image=PNG, JPEG, FITS
-space.accepts.table=VOTABLE, FITS_TABLE
-space.accepts.archive=TAR
-space.accepts.other=ASCII
-space.provides.image=PNG, JPEG, FITS
-space.provides.table=VOTABLE, FITS_TABLE
-space.provides.archive=TAR
-space.provides.other=ASCII
-
-# Protocols
-space.protocol.client=http-get, http-put
-space.protocol.server=http-get, http-put
-space.protocol.handler.http-get=edu.caltech.vao.vospace.protocol.HttpGetProtocolHandler
-space.protocol.handler.http-put=edu.caltech.vao.vospace.protocol.HttpPutProtocolHandler
-
-# IVOA base identifier for capabilities
-space.capability.baseivorn = ivo://datalab.noao/vospace/capabilities
-
-# Capabilities
-space.capability.exe=/home/graham/capRunner.py
-space.capability.port=20001
-space.capabilities=runner,tableingester,downloader
-space.capability.runner=edu.caltech.vao.vospace.capability.CapRunner
-space.capability.runner.port=20001
-space.capability.tableingester=edu.caltech.vao.vospace.capability.TableIngester
-
-# Properties for logging
-log4j.rootLogger = info, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logfile.File=vospace.log
-log4j.appender.logfile.DatePattern='.'yyyy-ww
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
diff --git a/java/vospace.properties.gp04 b/java/vospace.properties.gp04
deleted file mode 100644
index 115ba5a..0000000
--- a/java/vospace.properties.gp04
+++ /dev/null
@@ -1,70 +0,0 @@
-# Properties file for VOSpace
-# Version: 03/28/2017
-# Metadata store
-store.type=mysql
-store.type.virtuoso=edu.caltech.vao.vospace.meta.VirtuosoMetaStore
-store.type.mysql=edu.caltech.vao.vospace.meta.MySQLMetaStore
-
-# Backend storage
-backend.type=localfs
-backend.type.localfs=edu.caltech.vao.vospace.storage.LocalFSStorageManager
-backend.type.swift=edu.caltech.vao.vospace.storage.SwiftStorageManager
-
-# External address of HTTP data server
-server.http.url=http://gp04.datalab.noirlab.edu:8080/vospace-2.0/vospace/data
-
-# External address of transfers endpoint
-server.transfer.url=http://gp04.datalab.noirlab.edu:8080/vospace-2.0/vospace/transfers
-
-# External address of Datalab Authentication service
-server.auth.url=https://datalab.noirlab.edu/auth
-
-# Root directory for HTTP data server (should be same as space.baseuri without file:// scheme identifier)
-server.http.basedir=/net/dl2/vospace/users
-server.meta.dburl=localhost/vospace_prd
-
-# Username for db access
-server.meta.dbuid=dba
-# Password for db access
-server.meta.dbpwd=dba
-# Port the service will run on
-server.space.port=8080
-space.supports.structure=true
-# Root directory for the service storage
-space.baseuri=file:///net/dl2/vospace/users
-# Staging area for format conversions
-space.staging_area=file:///net/dl2/vospace/tmp
-# IVOA identifer for the service
-space.identifier=ivo://datalab.noirlab/vospace
-# VOSpace identifier for the root node
-space.rootnode=vos://datalab.noirlab!vospace
-
-# Formats
-space.accepts.image=PNG, JPEG, FITS
-space.accepts.table=VOTABLE, FITS_TABLE
-space.accepts.archive=TAR
-space.accepts.other=ASCII
-space.provides.image=PNG, JPEG, FITS
-space.provides.table=VOTABLE, FITS_TABLE
-space.provides.archive=TAR
-space.provides.other=ASCII
-
-# Protocols
-space.protocol.client=http-get, http-put
-space.protocol.server=http-get, http-put
-space.protocol.handler.http-get=edu.caltech.vao.vospace.protocol.HttpGetProtocolHandler
-space.protocol.handler.http-put=edu.caltech.vao.vospace.protocol.HttpPutProtocolHandler
-
-# IVOA base identifier for capabilities
-space.capability.baseivorn = ivo://datalab.noirlab/vospace/capabilities
-
-# Capabilities
-space.capability.exe=/home/graham/capRunner.py
-space.capability.port=20001
-space.capabilities=runner,tableingester,downloader
-space.capability.runner=edu.caltech.vao.vospace.capability.CapRunner
-space.capability.runner.port=20001
-space.capability.tableingester=edu.caltech.vao.vospace.capability.TableIngester
-
-# Properties for logging
-# look for log4j.xml
diff --git a/java/vospace.properties.vostest b/java/vospace.properties.vostest
deleted file mode 100644
index 03eadd9..0000000
--- a/java/vospace.properties.vostest
+++ /dev/null
@@ -1,70 +0,0 @@
-# Properties file for VOSpace
-# Version: 03/28/2017
-# Metadata store
-store.type=mysql
-store.type.virtuoso=edu.caltech.vao.vospace.meta.VirtuosoMetaStore
-store.type.mysql=edu.caltech.vao.vospace.meta.MySQLMetaStore
-
-# Backend storage
-backend.type=localfs
-backend.type.localfs=edu.caltech.vao.vospace.storage.LocalFSStorageManager
-backend.type.swift=edu.caltech.vao.vospace.storage.SwiftStorageManager
-
-# External address of HTTP data server
-server.http.url=http://vostest.datalab.noirlab.edu:8080/vospace-2.0/vospace/data
-
-# External address of transfers endpoint
-server.transfer.url=http://vostest.datalab.noirlab.edu:8080/vospace-2.0/vospace/transfers
-
-# External address of Datalab Authentication service
-server.auth.url=https://datalab.noirlab.edu/auth
-
-# Root directory for HTTP data server (should be same as space.baseuri without file:// scheme identifier)
-server.http.basedir=/data/vospace/users
-server.meta.dburl=gp05/vospace_prd
-
-# Username for db access
-server.meta.dbuid=dba
-# Password for db access
-server.meta.dbpwd=dba
-# Port the service will run on
-server.space.port=8080
-space.supports.structure=true
-# Root directory for the service storage
-space.baseuri=file:///net/dl2/vospace/users
-# Staging area for format conversions
-space.staging_area=file:///net/dl2/vospace/tmp
-# IVOA identifer for the service
-space.identifier=ivo://datalab.noirlab/vospace
-# VOSpace identifier for the root node
-space.rootnode=vos://datalab.noirlab!vospace
-
-# Formats
-space.accepts.image=PNG, JPEG, FITS
-space.accepts.table=VOTABLE, FITS_TABLE
-space.accepts.archive=TAR
-space.accepts.other=ASCII
-space.provides.image=PNG, JPEG, FITS
-space.provides.table=VOTABLE, FITS_TABLE
-space.provides.archive=TAR
-space.provides.other=ASCII
-
-# Protocols
-space.protocol.client=http-get, http-put
-space.protocol.server=http-get, http-put
-space.protocol.handler.http-get=edu.caltech.vao.vospace.protocol.HttpGetProtocolHandler
-space.protocol.handler.http-put=edu.caltech.vao.vospace.protocol.HttpPutProtocolHandler
-
-# IVOA base identifier for capabilities
-space.capability.baseivorn = ivo://datalab.noirlab/vospace/capabilities
-
-# Capabilities
-space.capability.exe=/home/graham/capRunner.py
-space.capability.port=20001
-space.capabilities=runner,tableingester,downloader
-space.capability.runner=edu.caltech.vao.vospace.capability.CapRunner
-space.capability.runner.port=20001
-space.capability.tableingester=edu.caltech.vao.vospace.capability.TableIngester
-
-# Properties for logging
-# look for log4j.xml
diff --git a/java/cleardb.sql b/scripts/db/cleardb.sql
similarity index 100%
rename from java/cleardb.sql
rename to scripts/db/cleardb.sql
diff --git a/java/vospace_copy.sh b/scripts/db/vospace_copy.sh
similarity index 100%
rename from java/vospace_copy.sh
rename to scripts/db/vospace_copy.sh
diff --git a/java/vospace_copy.sql b/scripts/db/vospace_copy.sql
similarity index 100%
rename from java/vospace_copy.sql
rename to scripts/db/vospace_copy.sql
diff --git a/java/vospace_create.sh b/scripts/db/vospace_create.sh
similarity index 100%
rename from java/vospace_create.sh
rename to scripts/db/vospace_create.sh
diff --git a/java/vospace_create.sql b/scripts/db/vospace_create.sql
similarity index 100%
rename from java/vospace_create.sql
rename to scripts/db/vospace_create.sql
diff --git a/java/vospace_update.sql b/scripts/db/vospace_update.sql
similarity index 100%
rename from java/vospace_update.sql
rename to scripts/db/vospace_update.sql
diff --git a/java/setup.csh b/scripts/setup.csh
similarity index 100%
rename from java/setup.csh
rename to scripts/setup.csh
diff --git a/java/setup.sh b/scripts/setup.sh
similarity index 100%
rename from java/setup.sh
rename to scripts/setup.sh
diff --git a/java/test_vospace.sh b/scripts/test_vospace.sh
similarity index 100%
rename from java/test_vospace.sh
rename to scripts/test_vospace.sh
diff --git a/java/vo_import.sh b/scripts/vo_import.sh
similarity index 100%
rename from java/vo_import.sh
rename to scripts/vo_import.sh
diff --git a/java/vos_dir.sh b/scripts/vos_dir.sh
similarity index 100%
rename from java/vos_dir.sh
rename to scripts/vos_dir.sh