Updated and simplified master

Reverted to default Craft folder structure
Commented out several default config overrides