Renames modules.py->routes.py; misc cleanup