Move instance variables out of modules