Rename Match.h to entities/Match.h