examples work with new structure; closes #5