Moved object classes to entity folder