split container & objectCollection into separate modules