cleanup container impl
refactoring
stuff
rename packages
update stuff
updates
update for java.util.stream