Reorganize JS files