Revert "More reorganizing"

This reverts commit 44dfef9f61fd399e8a8b6995416e9ae067109850.