Definition changes

Some basic definition is changed
Change the organization