Applying new directory structure