adding some new attribute classes
renaming some interfaces
removing obsolete classes