Move examples, added TODO