refactored files
same
merged simple operations
changed json.prog