Refactored classloader and more work on routing system