directory structure fixes