[TM] Moved stuff into the right places