Moved calculator within pkgs/