fixing more paths
Initial dist subtree commit