Moved container classes into subdir