Folder reorganization
Use environment variable for deployment settings.