Rework on modules and dns, added encryption