Ofertie ncl refactor

- Remove reroute methods.
- Add dependency to genericnetwork
- Move features to same bundle.