revert
Revert "revert"

This reverts commit 725eff0830a6205e547498c8b280ecb802276025.
big time changes, but nothing broken

Some tweaks needed to place objects and enemies better
Also the badGuy update, obstacle update and structure update all need
fixing