Reffactoring

data to JSON transition;
structure was improved