diff --git a/src/Gateways/AbstractGateway.php b/src/Gateways/AbstractGateway.php
index 196c87d..c668057 100644
--- a/src/Gateways/AbstractGateway.php
+++ b/src/Gateways/AbstractGateway.php
@@ -16,7 +16,6 @@
 use litvinjuan\LaravelPayments\Requests\AbstractRequest;
 use litvinjuan\LaravelPayments\Requests\AbstractValidatePaymentRequest;
 use litvinjuan\LaravelPayments\Requests\AbstractVoidRequest;
-use litvinjuan\LaravelPayments\Util\GatewayShortNameGenerator;
 
 /**
  * @method AbstractPaymentNotificationRequest paymentNotification(array $parameters = array())
diff --git a/src/Util/GatewayShortNameGenerator.php b/src/Gateways/GatewayShortNameGenerator.php
similarity index 76%
rename from src/Util/GatewayShortNameGenerator.php
rename to src/Gateways/GatewayShortNameGenerator.php
index 81881c2..8088d64 100644
--- a/src/Util/GatewayShortNameGenerator.php
+++ b/src/Gateways/GatewayShortNameGenerator.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace litvinjuan\LaravelPayments\Util;
+namespace litvinjuan\LaravelPayments\Gateways;
 
 use Illuminate\Support\Str;
-use litvinjuan\LaravelPayments\Gateways\GatewayInterface;
 
 class GatewayShortNameGenerator
 {
diff --git a/src/Payments/Payment.php b/src/Payments/Payment.php
index df9d850..6c283a8 100644
--- a/src/Payments/Payment.php
+++ b/src/Payments/Payment.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Konekt\Enum\Eloquent\CastsEnums;
+use Money\Currency;
 use Money\Money;
 
 /**
@@ -62,7 +63,7 @@ public function payer(): MorphTo
 
     public function getPriceAttribute(): Money
     {
-        return money($this->attributes['price']);
+        return new Money($this->attributes['price'], new Currency(config('laravel-payments.currency')));
     }
 
     public function setPriceAttribute(Money $money)
@@ -72,7 +73,7 @@ public function setPriceAttribute(Money $money)
 
     public function getPaidAttribute(): Money
     {
-        return money($this->attributes['paid']);
+        return new Money($this->attributes['paid'], new Currency(config('laravel-payments.currency')));
     }
 
     public function setPaidAttribute(Money $money)
diff --git a/src/Util/helpers.php b/src/Util/helpers.php
deleted file mode 100644
index 6b45eeb..0000000
--- a/src/Util/helpers.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Money\Currency;
-use Money\Money;
-
-if (! function_exists('money')) {
-    function money(?int $amount, $currency = null)
-    {
-        if (! $amount) {
-            $amount = 0;
-        }
-
-        if (! $currency) {
-            $currency = config('laravel-payments.currency', 'ARS');
-        }
-
-        return new Money($amount, new Currency($currency));
-    }
-}