Reorganized JS files