Changing to the simple package format.