Removed JSON files
Fixed a typo
Increased decoupling