EntitySystem changes, EditorAppState and HexMapAppState split