Setup some json classes for appwarp. Also, cleaned up more code.