Restructure
Merge pull request #131 from vmoravec/inetd

Inetd - Restructure