Reorganize code a little bit.

This reorganization is temporary till the library grows a little.
Avoiding doing anything complicated till more of the library is implemented.