More moving around

This reverts commit 08d89ba5d1d47ec691fcf19347311d59585f57f8.