Started changing the routes to work with the nested resource switchup.
Fixed last commit by adding the files I thought were added.