Consolidate all JS into one file
Correct naming error