Start moving stuff around for new build