master
Extracted other features and classes into separate files, fixed few ligatures conflicts with arrows