[dist] Moved calculator to dev branch