Changing the directories to be more generic