Changed file structure again, updated settings for postgres and S3 storage