Added Object class

Changed XMLObject to Object class and removes (some) tabs from between
tabs