Game Clean Merge

Started on world stuff
Reworking entities
Merging game into client