Moved some file match settings to config