mainly change to ES6 demo files