Reorder JS files
Merged conflicts