ncplus refactor
file moved
final sync with RasspberyPi