Improved package names

This commit looks big and confusing because I have renamed each of the
packages to have more meaningful names. Hopefully your ok with the new
names, shouldn't be all that hard to rename again.