at the 7/16 Tech Huddle, we thought it would probably be a good idea to combine all the code for the two existing repos into one by copying Michael's code into the original repo and moving the original code under a sub-folder to match the convention in Michael's repo.

See checklist in linked PR