Clean up and reorganize
Restore functionality after reorganization

away with all this bookkeeping and synching!
minor fixes and a working test-asteroid!