Removed the tuntap library and go back to Water
Cleanups and more features