diff --git a/README b/README
index 5c9d0bea07e0922527285fd4b4617ebba3f8a310..66727b75c412d366b6a6584d82f1e455759c5001 100644
--- a/README
+++ b/README
@@ -8,51 +8,43 @@ DESCRIPTION
     around the software applications, frameworks, and libraries you need
     to run on high-performance computing systems.
 
-    * https://sylabs.io/guides/latest/user-guide/
+    * https://sylabs.io/guides/latest/user-guide
 
 USAGE
 
-     1. Install Singularity on your local desktop, laptop, or virtual 
+     1. Install Singularity on your Linux desktop, laptop, or virtual
         machine. 
 
             ./naked-singularity.sh install
 
-        Note, however, this install command and the uninstall command 
-        below are currently only vaild for Singularity v2.6.1 or less.
-        An update for the Singularity v3.X.X series is in progress.
+     2. Build a simple base Ubuntu Singularity container. 
 
-     2. Build a simple Ubuntu Singularity container. 
+            sudo singularity build ubuntu.sif definition-files/ubuntu/Singularity.ubuntu-18.04
 
-            ./naked-singularity.sh build -s comet -a ubuntu -d ubuntu.def 
+        A number of pre-built containers from this repository are also 
+        now hosted at both Singularity Hub
 
-        This build command is currently only valid for the older 
-        versions of the repository's definition files. All new 
-        definition files hosted as git submodules should be built 
-        directly using Singularity.
+            singularity pull shub://mkandes/naked-singularity:ubuntu-18.04
+   
+        and Sylabs' Container Library
 
-            sudo singularity build ubuntu.sif ubuntu/Singularity
+            singularity pull library://mkandes/naked-singularity:ubuntu-18.04
 
-        A number of the containers are also now hosted at Singularity Hub.
-
-            singularity pull shub://mkandes/ubuntu
-
-     3. Uninstall Singularity from your local desktop, laptop, or 
+     3. Uninstall Singularity from your Linux desktop, laptop, or 
         virtual machine.
 
             ./naked-singularity.sh uninstall
 
 STATUS
 
-    A work in progress.
-
-    IMPORTANT: The repository is currently undergoing a restructuring. 
-               All new definition files will be hosted as git submodules 
-               of the main repository here.
+    This repository is currently undergoing a major restructuring. 
+    Significant changes over the next few weeks should be expected.
 
 CONTRIBUTE
 
     If you would like to contribute one of your own Singularity 
-    definition files for a target application and system, please 
+    container definition files for a specific application OR request 
+    a modification to an existing container definition, then please
     submit a pull request.
 
 AUTHOR
@@ -65,8 +57,8 @@ AUTHOR
 
 VERSION
 
-    1.0.0
+    1.0.1
 
 LAST UPDATED
 
-    Thursday, June 4th, 2020
+    Saturday, December 26th, 2020
diff --git a/definition-files/comet/R/R.def b/archive/comet/R/R.def
similarity index 100%
rename from definition-files/comet/R/R.def
rename to archive/comet/R/R.def
diff --git a/definition-files/comet/apbs-pdb2pqr-browndye/README.md b/archive/comet/apbs-pdb2pqr-browndye/README.md
similarity index 100%
rename from definition-files/comet/apbs-pdb2pqr-browndye/README.md
rename to archive/comet/apbs-pdb2pqr-browndye/README.md
diff --git a/definition-files/comet/apbs-pdb2pqr-browndye/apbs-pdb2pqr-browndye.def b/archive/comet/apbs-pdb2pqr-browndye/apbs-pdb2pqr-browndye.def
similarity index 100%
rename from definition-files/comet/apbs-pdb2pqr-browndye/apbs-pdb2pqr-browndye.def
rename to archive/comet/apbs-pdb2pqr-browndye/apbs-pdb2pqr-browndye.def
diff --git a/definition-files/comet/beast/beast-gpu.def b/archive/comet/beast/beast-gpu.def
similarity index 100%
rename from definition-files/comet/beast/beast-gpu.def
rename to archive/comet/beast/beast-gpu.def
diff --git a/definition-files/comet/beast2/beast2-gpu.def b/archive/comet/beast2/beast2-gpu.def
similarity index 100%
rename from definition-files/comet/beast2/beast2-gpu.def
rename to archive/comet/beast2/beast2-gpu.def
diff --git a/definition-files/comet/caffe/caffe-gpu.def b/archive/comet/caffe/caffe-gpu.def
similarity index 100%
rename from definition-files/comet/caffe/caffe-gpu.def
rename to archive/comet/caffe/caffe-gpu.def
diff --git a/definition-files/comet/centos/centos-6-cuda.def b/archive/comet/centos/centos-6-cuda.def
similarity index 100%
rename from definition-files/comet/centos/centos-6-cuda.def
rename to archive/comet/centos/centos-6-cuda.def
diff --git a/definition-files/comet/centos/centos-6.def b/archive/comet/centos/centos-6.def
similarity index 100%
rename from definition-files/comet/centos/centos-6.def
rename to archive/comet/centos/centos-6.def
diff --git a/definition-files/comet/centos/centos-cuda-openmpi.def b/archive/comet/centos/centos-cuda-openmpi.def
similarity index 100%
rename from definition-files/comet/centos/centos-cuda-openmpi.def
rename to archive/comet/centos/centos-cuda-openmpi.def
diff --git a/definition-files/comet/centos/centos-cuda.def b/archive/comet/centos/centos-cuda.def
similarity index 100%
rename from definition-files/comet/centos/centos-cuda.def
rename to archive/comet/centos/centos-cuda.def
diff --git a/definition-files/comet/centos/centos-openmpi.def b/archive/comet/centos/centos-openmpi.def
similarity index 100%
rename from definition-files/comet/centos/centos-openmpi.def
rename to archive/comet/centos/centos-openmpi.def
diff --git a/definition-files/comet/centos/centos.def b/archive/comet/centos/centos.def
similarity index 100%
rename from definition-files/comet/centos/centos.def
rename to archive/comet/centos/centos.def
diff --git a/definition-files/comet/deepbench/deepbench.def b/archive/comet/deepbench/deepbench.def
similarity index 100%
rename from definition-files/comet/deepbench/deepbench.def
rename to archive/comet/deepbench/deepbench.def
diff --git a/definition-files/comet/gromacs/gromacs-cpu.def b/archive/comet/gromacs/gromacs-cpu.def
similarity index 100%
rename from definition-files/comet/gromacs/gromacs-cpu.def
rename to archive/comet/gromacs/gromacs-cpu.def
diff --git a/definition-files/comet/jupyter/jupyter-cpu.def b/archive/comet/jupyter/jupyter-cpu.def
similarity index 100%
rename from definition-files/comet/jupyter/jupyter-cpu.def
rename to archive/comet/jupyter/jupyter-cpu.def
diff --git a/definition-files/comet/keras/keras-tensorflow-cpu.def b/archive/comet/keras/keras-tensorflow-cpu.def
similarity index 100%
rename from definition-files/comet/keras/keras-tensorflow-cpu.def
rename to archive/comet/keras/keras-tensorflow-cpu.def
diff --git a/definition-files/comet/keras/keras-tensorflow-gpu.def b/archive/comet/keras/keras-tensorflow-gpu.def
similarity index 100%
rename from definition-files/comet/keras/keras-tensorflow-gpu.def
rename to archive/comet/keras/keras-tensorflow-gpu.def
diff --git a/definition-files/comet/keras/keras-theano-cpu.def b/archive/comet/keras/keras-theano-cpu.def
similarity index 100%
rename from definition-files/comet/keras/keras-theano-cpu.def
rename to archive/comet/keras/keras-theano-cpu.def
diff --git a/definition-files/comet/keras/keras-theano-gpu.def b/archive/comet/keras/keras-theano-gpu.def
similarity index 100%
rename from definition-files/comet/keras/keras-theano-gpu.def
rename to archive/comet/keras/keras-theano-gpu.def
diff --git a/definition-files/comet/meep/meep.def b/archive/comet/meep/meep.def
similarity index 100%
rename from definition-files/comet/meep/meep.def
rename to archive/comet/meep/meep.def
diff --git a/definition-files/comet/mxnet/mxnet-cpu.def b/archive/comet/mxnet/mxnet-cpu.def
similarity index 100%
rename from definition-files/comet/mxnet/mxnet-cpu.def
rename to archive/comet/mxnet/mxnet-cpu.def
diff --git a/definition-files/comet/mxnet/mxnet-gpu.def b/archive/comet/mxnet/mxnet-gpu.def
similarity index 100%
rename from definition-files/comet/mxnet/mxnet-gpu.def
rename to archive/comet/mxnet/mxnet-gpu.def
diff --git a/definition-files/comet/neon/neon-cpu.def b/archive/comet/neon/neon-cpu.def
similarity index 100%
rename from definition-files/comet/neon/neon-cpu.def
rename to archive/comet/neon/neon-cpu.def
diff --git a/definition-files/comet/pytorch/pytorch-cpu.def b/archive/comet/pytorch/pytorch-cpu.def
similarity index 100%
rename from definition-files/comet/pytorch/pytorch-cpu.def
rename to archive/comet/pytorch/pytorch-cpu.def
diff --git a/definition-files/comet/pytorch/pytorch-gpu.def b/archive/comet/pytorch/pytorch-gpu.def
similarity index 100%
rename from definition-files/comet/pytorch/pytorch-gpu.def
rename to archive/comet/pytorch/pytorch-gpu.def
diff --git a/definition-files/comet/smcpp/smcpp.def b/archive/comet/smcpp/smcpp.def
similarity index 100%
rename from definition-files/comet/smcpp/smcpp.def
rename to archive/comet/smcpp/smcpp.def
diff --git a/definition-files/comet/tensorflow/tensorflow-cpu.def b/archive/comet/tensorflow/tensorflow-cpu.def
similarity index 100%
rename from definition-files/comet/tensorflow/tensorflow-cpu.def
rename to archive/comet/tensorflow/tensorflow-cpu.def
diff --git a/definition-files/comet/tensorflow/tensorflow-gpu.def b/archive/comet/tensorflow/tensorflow-gpu.def
similarity index 100%
rename from definition-files/comet/tensorflow/tensorflow-gpu.def
rename to archive/comet/tensorflow/tensorflow-gpu.def
diff --git a/definition-files/comet/theano/theano-cpu.def b/archive/comet/theano/theano-cpu.def
similarity index 100%
rename from definition-files/comet/theano/theano-cpu.def
rename to archive/comet/theano/theano-cpu.def
diff --git a/definition-files/comet/theano/theano-gpu.def b/archive/comet/theano/theano-gpu.def
similarity index 100%
rename from definition-files/comet/theano/theano-gpu.def
rename to archive/comet/theano/theano-gpu.def
diff --git a/definition-files/comet/torch/torch-gpu.def b/archive/comet/torch/torch-gpu.def
similarity index 100%
rename from definition-files/comet/torch/torch-gpu.def
rename to archive/comet/torch/torch-gpu.def
diff --git a/definition-files/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def b/archive/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
rename to archive/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
diff --git a/definition-files/comet/ubuntu/ubuntu-cuda-opencl.def b/archive/comet/ubuntu/ubuntu-cuda-opencl.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-cuda-opencl.def
rename to archive/comet/ubuntu/ubuntu-cuda-opencl.def
diff --git a/definition-files/comet/ubuntu/ubuntu-cuda-openmpi.def b/archive/comet/ubuntu/ubuntu-cuda-openmpi.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-cuda-openmpi.def
rename to archive/comet/ubuntu/ubuntu-cuda-openmpi.def
diff --git a/definition-files/comet/ubuntu/ubuntu-cuda.def b/archive/comet/ubuntu/ubuntu-cuda.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-cuda.def
rename to archive/comet/ubuntu/ubuntu-cuda.def
diff --git a/definition-files/comet/ubuntu/ubuntu-mvapich2.def b/archive/comet/ubuntu/ubuntu-mvapich2.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-mvapich2.def
rename to archive/comet/ubuntu/ubuntu-mvapich2.def
diff --git a/definition-files/comet/ubuntu/ubuntu-openmpi.def b/archive/comet/ubuntu/ubuntu-openmpi.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu-openmpi.def
rename to archive/comet/ubuntu/ubuntu-openmpi.def
diff --git a/definition-files/comet/ubuntu/ubuntu.def b/archive/comet/ubuntu/ubuntu.def
similarity index 100%
rename from definition-files/comet/ubuntu/ubuntu.def
rename to archive/comet/ubuntu/ubuntu.def
diff --git a/naked-singularity.sh b/archive/naked-singularity.sh
similarity index 100%
rename from naked-singularity.sh
rename to archive/naked-singularity.sh
diff --git a/definition-files/tscc/keras/keras-tensorflow-cpu.def b/archive/tscc/keras/keras-tensorflow-cpu.def
similarity index 100%
rename from definition-files/tscc/keras/keras-tensorflow-cpu.def
rename to archive/tscc/keras/keras-tensorflow-cpu.def
diff --git a/definition-files/tscc/keras/keras-tensorflow-gpu.def b/archive/tscc/keras/keras-tensorflow-gpu.def
similarity index 100%
rename from definition-files/tscc/keras/keras-tensorflow-gpu.def
rename to archive/tscc/keras/keras-tensorflow-gpu.def
diff --git a/definition-files/tscc/pytorch/pytorch-gpu.def b/archive/tscc/pytorch/pytorch-gpu.def
similarity index 100%
rename from definition-files/tscc/pytorch/pytorch-gpu.def
rename to archive/tscc/pytorch/pytorch-gpu.def
diff --git a/definition-files/tscc/tensorflow/tensorflow-cpu.def b/archive/tscc/tensorflow/tensorflow-cpu.def
similarity index 100%
rename from definition-files/tscc/tensorflow/tensorflow-cpu.def
rename to archive/tscc/tensorflow/tensorflow-cpu.def
diff --git a/definition-files/tscc/tensorflow/tensorflow-gpu.def b/archive/tscc/tensorflow/tensorflow-gpu.def
similarity index 100%
rename from definition-files/tscc/tensorflow/tensorflow-gpu.def
rename to archive/tscc/tensorflow/tensorflow-gpu.def
diff --git a/definition-files/tscc/ubuntu/ubuntu-cuda-openmpi.def b/archive/tscc/ubuntu/ubuntu-cuda-openmpi.def
similarity index 100%
rename from definition-files/tscc/ubuntu/ubuntu-cuda-openmpi.def
rename to archive/tscc/ubuntu/ubuntu-cuda-openmpi.def
diff --git a/definition-files/tscc/ubuntu/ubuntu-cuda.def b/archive/tscc/ubuntu/ubuntu-cuda.def
similarity index 100%
rename from definition-files/tscc/ubuntu/ubuntu-cuda.def
rename to archive/tscc/ubuntu/ubuntu-cuda.def
diff --git a/definition-files/tscc/ubuntu/ubuntu.def b/archive/tscc/ubuntu/ubuntu.def
similarity index 100%
rename from definition-files/tscc/ubuntu/ubuntu.def
rename to archive/tscc/ubuntu/ubuntu.def