Rearranged xcpd files to single directory