Cleaning up

Created modules trains and routing
General clean up in imports