Adding correct file directory structure