Changed a few import paths to represent where the file can actually be
found