Updates to Scenario 3A
Move everything to the new directory structure