Refctor package names.
Adding a first test case.