Updated organization of phase classes and removed unnecessary classes