Reorganize and get ready for move