Revert "Restructuring"

This reverts commit adf49d6cba4d972b2c675e3b308bee8fc1efb0d2.