Reorganize the code for better importing

And for better go-getting…