Simplifies API.

Some feature removed.
Moves test out of src/