Updated new directory structure