Lots of changes to the basic package structure.