Created base scenario for multiple-hub run.
Some more reorganization.