Modifications to organize javascript into modules
Revise wording