fix paths, change concat filenames

not overly happy with how complex this is getting -- there's a fair few
moving parts and with that comes more liklihood of b0rkage and an
increase in debugging time