Refactor folder structure
Add contributor