Some refactoring
Add dist files