Refactored into a more modular design
Updated meteor release to 0.8.3
Refactor, further modularisation