reorganised js files