Revert "Moved some stuff"

This reverts commit 87201961f7615f0387482d34d8f9edc7d663f26d.