Remove legacy classes, class organization