Refactor modules to UpperClass