merging javascript and js into one folder