Move code to subdirectory matching package name
Fix typo
Add tests