Majot refractoring of classes done