updated directories structure