Fixed README.md typo
Refactored modules (closes #5). Updated tests (closes #1)