Completing modularisation work

Update package.json and tidying up after modularisation.

http://jira.webinos.org/browse/WP-956