Move files into more-proper positions, fix selecting and editing notes in the note-list