Move folders with multiple files to single files on controllers and routes
Merge pull request #63 from neighborly/jl-improve-structure

Move folders with multiple files to single files on controllers and routes