Cleanup and tidying of route and model files