syncro: cleanup
7: Separate support files for cucumber and mocha, cleanup