Changed directories structure