Rework build setup