version 2

- change sequence of modules
- rename js questionnaires
- clean up