Moved some more engine modules into plugins