Restructuring build system: work in progress!