Moved container package to common