Initial dist subtree commit
Refactored code