New file naming convention.
Replaced item include shortcut .. with + and -, other updates.