Remove ClassMethods module
Rename and update InstanceMethods to Base
Include new modules
Commit new specs