updated directory structure