Project restructuring. No functional changes.