Renamed files and edited comments to fit rename.