Moved JS files around to clean up the files