Moved the two JS files into one file