Refactoring & adding config.conf