Have reduced using references in certain files to simplify the dependencies.