Build-system: changed structure