JavaScript interface changes

Moved the JavaScript interfaces out of their own class and into
MainActivity