Minor refactoring and suffixed all json storage files with ".json"
Refactoring the interface
Docblock comments