WIP of restructuring build system