Revert "big refactor: removed all FScheme from Core"

This reverts commit b8ac796a89aa4aebec81b053d0eb967c6e0d90ee.