Core

Moved content to different places. See Design.