- Added most of the base classes
Revert "- Added most of the base classes"

This reverts commit dd71da5c33599edf7dff7f7896768c289e743544.
- Added most of the Base Classes