Refactored configuration
Removed unused files