Some cleanup and change in the package name