Refactored with new plan for commercial organization