moved over waypoints

Demo:
-removed airspace_waypoints

GameWindow:
-misc. tidying
-added airspaceWaypoints
+initialised in constructor