Removed duplicate class structure
Merged branches
Prepare for revert :P
Revert "Prepare for revert :P"

This reverts commit 1a4969bda8e0d16a32ddb13acd6b9e65040a509b.
Moved init
Fixed merging errors
Renders and prelim thaum stuff
Research Table can now research!
Merge branch 'master' into research