Entirely changed the directories structure