classes updated

x,y,z taken from the model and got rid of StaticObject because it only
contained x,y,z