Starting to remove the hardcoded path dependencies