reorganize, start build setup