Add bucket and refacto
Update README