Add addModule, rename types to classes