Fix directory structure for lhapdf6 and some improvements