moved more basic structures for math