Rename package and rearrange test file.