Implemented Container base and move bases to different package