- reorganizing package structure
- cleaning up tests