Renamed packages to be singular and moved NoteComponent into the note package as is more appropriate.