Updated import to use Github rather than local copies