osx: refactor
core: moved Root to interface
osx: fixed inc/dec