Moved math to outer dir