renamed services to classes
changed form guice to cdi annotations
changed from guice to cdi annotations