solidified game logic, restructured folderers