Revert "framework: Split off some packages to a new file"

This reverts commit a3dd6161eb8c36d83777e136ca60cd08e1f8fb51.