Modified directory structure to be compliant with guidelines