Remove unused methods, update tests, modularize.
Update README, add usage examples