js files rearranged