Change package names
Add coverage