Updated names of packages, and cleaned up code.