Cleanup
Change controller and loader
Refactor with requirejs