Renamed files, added randomize function