minor changes in the directories organization