Fix directory name (woops!); abstract out json stuff so I can use gson