Reorg

Yeah this diff looks WAY worse that it should. Just moved everything to be in `(function($){...})(jQuery)`