Revert "structure changes"

This reverts commit 53b79bf5a85e6f9a5681e5f0f1f62102959e7df7.