Better dot-file organisation