Fixed directory structure a bit