take advantage of per-dist feature
move to own directory