Finish working on JSON files, move the JSON classes to the .db subpackage