Renamed some files and small improvements