Preparing for implementing GUI to game state + added namespaces