Reworked hirearchy to work with new game logic and ui