Revert "Change hierarchy =)"

This reverts commit 194b960f4df0be22f6bac4c9777f07f6883035db.