Modularizing JS
More Modularizing, now lint free!