created JSONfactory, removed depreicated classes, formatting