Moved everything up to container package