Move existing codebase into new class design