Reorganize classes (WIP)