cleaning up the code and moving mobiles and base stations to globals
Merge branch 'restructure' into develop