Dhcp package

Reworked history, with no conflicts