Revert "Movig stuff around"

This reverts commit 6309fa97ad40504c64d907b1e11939caeaa63622.