Improve structure again
Add example code