More restructuring, created operators package for chapter 4 code