Data directory structure changes