Move them to their own package
Meh