Updates to Scenario 3A and a move to the new folder structure