Moved facets to specific packages