Start refactoring notes layer