Added new directory structure