Refactored folder structure
Refactored folder structure