Rearrange RawLibrary and OneSixLibrary heavily.

Fix #396