Updated directories structure