Reorganizing configuration file into multiple files and simplifying content
Refactoring and cleaning up code