Restructure naming for components and componentTypes.

Also, remove cells and mechanisms that are not needed any more.