INT: improved build system