Reducing interpackage dependencies - moved categories etc.