Added layers.  Moved parts.

Per discussion between Pekka and Antti.