Moved things around to get a proper folder structure

Moving things around to get better folder structure


I had to do that because it is currently an internal only function (not exported in __init__.py). I could actually remove it entirely, and make it a function that lives in the tests instead. WDYT?

It should always be the same, but _cp3 is definitely more readable/friendly