Move the cell models into new directory, and manage multi definitions.