rework repository structure to use dub