Remove unused delegate matcher
Use 1 file per class