Begin implement route and route collection classes
Merge branch 'master' into routes
Implemented route class