organizing, preparing for move to new repo