Reorganize JS files
Reorganize JS files