Moved stuff around.

Quick fix.