Beginnings of refactoring first pass
Merge branch 'dev' of https://github.com/doctorspoof/SpaceShooter into dev