maybe move the originals of these into a utils location, and import them here (and elsewhere if you move them).