Inetd - Restructure

* does not compile yet, blocked by Users