Moved things around to get a proper folder structure

Moving things around to get better folder structure


Ah, true -- you actually did all that init stuff, and `_cp3` is an underscore method. Sorry about that. Is it never called outside the tests, because successfully replaced by the more general method?