Reestructured the configuration (major changes; your project will need refactoring;)