Revert "moved some stuff"

This reverts commit 59283dfd4f474ab668886e07b39096e5183c581f.