changing the class organization