I have blk001.dat - 003 and index in my main Bitcoin dir, then there is another dir Blocks that seems to have similarly named files, these look like they have a more recent last modified date...so I guess these are the ones I want to keep?
EDIT: nuked everything except bitcoin.conf and wallet.dat and all seems well; had to redownload the blockchain again but that is no problem