Remove bad naming, some refacto…
Update README after previous refacto
Class O: added helpers to select right type
Class S: now use new type helpers
Start using helper type into N