Better implementation for reading *.properties.
notes-headers-map created.
Code reorganization.