Moved match rule classes in to individual files