We should either move them into one of their relevant packages or make a directory for that kind of thing See also #2565