Refactoring Config
Finished refactor of config and logging