Moved un-named Enums inside relevant classes