Smarter route loading, more sensible folder names