Renamed the directories for a more clear organization