Rework build and watch flow