reworked build system
reworked build system