Renamed MenuManager to MenuStorage and MenuManager2 to MenuManager