changing directory structure a bit