Reorganize
Add initial dist