I need to study module patterns more to figure out what is going wrong in my refactoring. Refactoring has been unsuccessful thus far.