removing IContainer, renaming Container to DiContainer, replacing references to IContainer with DiContainer