Organizes JS code
Merge pull request #24 from slkennedy/sara-master

Organizes JS code