Class restructuring (WIP)