Made folders for classes, refactored GameManager
Fixed merge conflict