Adding a couple potential JSON downloading methods and reorganzing some classes.