fixed directory structure a bit