Revert "general classes and interfaces"

This reverts commit a292dcf2916edd7d3447d898b9e9ec305bfd2c3b.