changing around classes
Revert "changing around classes"

This reverts commit 0c5e4cd87ef2f4cc0fb2e99f05d35492b340f446.
Revert "deleted unnecessary things"

This reverts commit 7a486a3af835d5a7276bdaa748ce2cf4f4afd7e4.