minor directory structure changes