Fix up a few formatting bugs.
Remove unnecessary manifest file.
Move files to a new directory for new package name.