remove unnecessary di structure
Merge remote-tracking branch 'origin/feature/container' into feature/container