Some file names and imports changed