Revert "added some more classes from metact project"

This reverts commit 094f97f6ec976a0aae28f041ccfcd42a0eeb877b.
Revert "Revert "added some more classes from metact project""

This reverts commit 99f38970345705d9d693b77f8a6e8b43064b4dda.