consolidating model files
fixing meteor release - 0.8.3 breaks iron-router?