Shuffled packages around into subpackages. Put in handling for descriptions.