Refactored packages => container sub package introduced