Change package structure to upstream

1 job for test_merge_upstream in 4 minutes and 17 seconds (queued for 1 second)