Refactor mlb organization