Js structure updates.
Partial commit for editing.