Revert "Restructured Engine"

This reverts commit 07d036d4ffa79208e92e1851f8028fdf94d30931.