Finished reorg

Adding files meant to be in last commit

Finished reorg
Merge branch 'reorg' of github.com:tstein4/urbuses into reorg