* adjusted basic example regarding new stuctures
* cleanup