Changed dir structure a bit