Reorganise scripts
Merge branch 'ejs-2'

* ejs-2:
  Reorganise scripts