Revamping build system, many changes