Started using meck.

Rearrange library.