Reorganized OfficeMoverActivity to be a bit easier to read