Some classes renamed & todo's done