More refactoring and Meteor version update.
Refactors some more stuff.