updated directory structure to meet requirements