Restructuring
Revert "Restructuring"

This reverts commit 9947425157649117e5e48adf41f773104e66c2d6.