Move matcher spec files to corresponding folder