Refactored heuristic to decide what should be in the system pythonpath or not and using on both places that need it.