Reorganized some stuff and ran some tests.
Added Road class