scheme: Reorganize files a bit and add define-match