Make use of CarbonDirectory / CarbonFile

- also some minor Json changes