Update folder structure
Encapsulate variables
Update README.md