Refactor clients to same-named files
Update License
Refactor tests

Closes #25