changed controller naming to be more standard, fixed regex for routes