Refactored code
Reorganized directory