Doing a complete tidy up of Game Engine

This is all the changes up until the tidy up hopefully the tidy up will
be done within the next change