Relocate elements

Move elements up one level.

Issue: #148