updates
removing Container.State for injection
succesfully removed Container.State from default injectable services
moving stuff around
updates
javadoc