New package naming convention.
Resolve merge conflict, remove old-style files.