Revert "Just re-organizing"

This reverts commit 6a4e4b811b2231e61a74bb396fccf3ecd87582f1.