Ofertie ncl refactor

- Remove reroute option
- Add dependency yo genericnetwork
- Reorder features in same bundle.