Changed config classes to singletons
Refactored router