Reorganize
Add persistent notes