Re-arranging things in 6.0

Package-Manager: portage-2.2.7
re-arranging things in 6.0

Package-Manager: portage-2.2.7
Re-adding sage sources in 6.0 but in a new location as upstream

Package-Manager: portage-2.2.7