refactor packaging to reflect business domain rather than technical
make some tests in adding groovy script for json
correct after groovy experiment