merge note to samezu, and rearrange the folders