Removed unnecessary configuration items and updated folder names
Update config settings
Merge pull request #36 from JRogaishio/develop

Develop