Ugh... No refactoring. This code is not built with modularity in mind. Rolling back to their tutorial, dealing with the extra files later...
Chapter 9 updates