Move some more involved examples to their own source files
update todo