More package folder hierarchy fixes for linux64

3 jobs for main in 1 minute and 34 seconds (queued for 4 seconds)
latest