Renamed files, minor fixes