Cleaned Up Folders. Refacrtored Encrypt/Auth