Using deftemplate for the scenes
Got rid of base, moved things into core and game
Got rid of the entity macros