Model redesigned.

Some entities are not needed anymore.