changed file stuff, to read all from one file, removed old files