Revert "Added Basic classes, some necessary variables"

This reverts commit 63419ebe48dd00b6899a51229d2be70999177b97.