changed structure be dub-like
changed structure be dub-like ... made first tests