Integrating changes from MindSnacks project and project reorg