Restructuring GUI, Renaming & reorganizing stuff