Prepare for deployment mainly by reorganizing