Initial commit
Simple refactoring and JSon + ES tests
refactorings