Changed filenames and removed redundant file generation code

File gen code was still inplace after I moved it to generate before hand