Refactored
Reorganized project