reorganized the js files