Refactored the folder & project structure