Reorganized Note file layouts.
Removed some more iOS specific dependencies from note controls.