Fixing up module imports and adding routes