change infrastructure for easy build of both variants: serial and parallel