Change dir structure
Add tests
Modify logging to output json