Add dns2, some fix all files and new (yours) structure.