Fixed more bad paths. Figuring out how to correctly reference these shimmed modules and their dependencies