Refactored the folder structure