Major refactoring to support more organised routes