Fix package names
Completed super simple implementation with test.