airQ and c4-airQ should be using Globals file now
Moved and renamed some files.

Actually finished test-sandbox move

Deleted and renamed files in src
Merge branch 'SU-consolidate' into develop