Major refactoring. Got rid of duplicate entities that served no real purpose. Just use raw JSON apis instead