Reworking build system partially.