Revert "Restructuring"

This reverts commit ad4ba364d20efb9030443507db5cd2c10a833563.