Moved math stuff to subdirectory