Modify directory location and code refactoring "RCSDiscoveryManager"