Rearrange into a package

Don't need this right now, but I will shortly.