Changed scratch dir to submodules. Updated Collector management python module.