WIP restructuring build process