Theme 2 Scenario A Waves

- Adhere to new directory structure
- Add model data
@daf please review
@birdage, @kknee FYI