Align requirements with new structure