Refactored modules. Bindings now placed in bindings.js