Began restructuring of code into modules.