Reorganize Avery's code into Sharlene/Swayam's structure
Merge pull request #2 from sharlwong/sharlene_swayam

Reorganize Avery's code into Sharlene/Swayam's structure