Refactoring of the directories structure