Refactored and Reorganized