Refactored the directories and paths