Test submodules
Reorganize for s3 deployment.
Changes to support s3 deployment.