Reorganizing js files