renames and cleanups
Started adding search. I'm not sure a 400k json file is healthy