Fix package name.
Fixup paths.