Add a helper for getting the right file
Use the helper to include errors in routing
Purge most of the explicit path munging
Merge branch 'feature/fs-api' into develop