Initial dist subtree commit
using main dir instead of dist/