Reorganizing classes

Not yet finished