More integration of stuff into tensor class and some renamings