Added defer helper
Renamed the directories