Revert "Frameworks: refactor, cleanup, centralize, fixes, features"

This reverts commit 998c4f7b9c2fefa472ef12e87d3b2c72a874be3a.