language, routing and configuration refactoring