changed modules to classes