Revert "Removed unecessary classes..."

This reverts commit 9f9af359fd9c0dac211cef43ccfff9c334894241.