Refactored to subpackage format due to json namespace collision