fixed file names and moved variables into each file