[MOD] Refactorings: "...Prop" classes renamed to "...Options"
[MIN] Maximum line length increased to 96