Revert "Started migration to Foundation"

This reverts commit 4c2f4dd4651953493b4ce64ec1b58b777ccd5560.