Restructured dirs in preparation for refactor

* Deleted old flight, we don't need it anymore.
Merge branch 'master' into flighttesting
Added scene changes to reflect new flight model