For notes within blocks, see my suggestion for a feature request and the response to it which shows the already-available Add Comment feature:
It’s not clear to me what you’re wanting for the other aspect of organizing your blocks/components. Do you mean in the Design tab or the Blocks tab? A screenshot or sketch of your needs would be helpful.