Made it a regid JSON.
Reorganized the directory structure.