Added gatewayd
Cleaned up
changed categories