Updated Routing Matches

Me and Alto are still having issues but we'll get them sorted.

Reduced number of files, will be removed in next commit.

Views will be updated for better routing