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

This reverts commit a8b594a5d8f779c56e5da54b2f9a61feaf506d75.