Ajusted the directories structure