Structure improvements

A lot of stuff there. All this is live in sandbox: http://metabrainz.mbsandbox.org/.