Convert to new 0.6.5 format

* Still waiting on meteor implementation of multiple sourceHandlers