More goodness
Fixing the package list
Better naming of things.