Change our routings to be more in line with Core
Merge pull request #52 from Jbekker/rename-routes

Change our routings to be more in line with Core