Reorganized packages so coverage information is more easily viewable.