Re-factor and Reorganize