Renamed some files and changed added a couple of ids