Refactors build based on class reorganization,
build