Reorganize scope in product