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