Adding a touch of organization to this thing.

but no tests :scream_cat: