Some reorg
Switch to new classes