Removed depreciated files, moved class members of StateManager to header