re-arranged js files