Module changed to classes