Project organization and demo project changes.