Cleaned up Filesystem
Reverted Changes that removed Some Layers

JJ needed some layers removed for another submission