Tweaking the dir structure a bit