Refactored whole configuration management (now using yml files)