Moved some files around, cleaned up old stuff. Need to remake the "base" soon.