DRY'd files some more
Finished layouts and routes.