diff --git a/Model/Checkout/LayoutProcessorPlugin.php b/Plugin/Checkout/LayoutProcessor.php
similarity index 93%
rename from Model/Checkout/LayoutProcessorPlugin.php
rename to Plugin/Checkout/LayoutProcessor.php
index 66a6b31..8933915 100755
--- a/Model/Checkout/LayoutProcessorPlugin.php
+++ b/Plugin/Checkout/LayoutProcessor.php
@@ -1,31 +1,42 @@
 <?php
-namespace SystemCode\BrazilCustomerAttributes\Model\Checkout;
+
+namespace SystemCode\BrazilCustomerAttributes\Plugin\Checkout;
 
 use SystemCode\BrazilCustomerAttributes\Helper\Data as Helper;
 
 /**
- *
  * Model to add label each address line
  *
- *
  * NOTICE OF LICENSE
  *
- * @category   SystemCode
- * @package    Systemcode_BrazilCustomerAttributes
- * @author     Eduardo Diogo Dias <contato@systemcode.com.br>
- * @copyright  System Code LTDA-ME
- * @license    http://opensource.org/licenses/osl-3.0.php
+ * @category  SystemCode
+ * @package   Systemcode_BrazilCustomerAttributes
+ * @author    Eduardo Diogo Dias <contato@systemcode.com.br>
+ * @copyright System Code LTDA-ME
+ * @license   http://opensource.org/licenses/osl-3.0.php
  */
-class LayoutProcessorPlugin
+class LayoutProcessor
 {
 
+    /**
+     * @var Helper
+     */
     protected $helper;
+
+    /**
+     * @var \SystemCode\BrazilCustomerAttributes\Model\Config\Source\Streetprefix
+     */
     protected $streetprefix;
+
+    /**
+     * @var Array
+     */
     protected $streetprefixoptions;
 
     /**
      * LayoutProcessorPlugin constructor.
-     * @param Helper $helper
+     *
+     * @param Helper                                                                $helper
      * @param \SystemCode\BrazilCustomerAttributes\Model\Config\Source\Streetprefix $streetprefix
      */
     public function __construct(
@@ -38,7 +49,7 @@ public function __construct(
 
     /**
      * @param \Magento\Checkout\Block\Checkout\LayoutProcessor $subject
-     * @param array $jsLayout
+     * @param array                                            $jsLayout
      * @return array
      */
 
@@ -54,7 +65,8 @@ public function afterProcess(
         return $jsLayout;
     }
 
-    public function setStreetPrefixOptions(){
+    public function setStreetPrefixOptions()
+    {
         $this->streetprefixoptions = [];
 
         if($this->helper->getConfig("brazilcustomerattributes/general/prefix_enabled")) {
@@ -67,7 +79,8 @@ public function setStreetPrefixOptions(){
         }
     }
 
-    public function getShippingFormFields($jsLayout, $numStreetLines){
+    public function getShippingFormFields($jsLayout, $numStreetLines)
+    {
         // Street Label
         $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
         ['shippingAddress']['children']['shipping-address-fieldset']['children']['street']['label'] = '';
@@ -82,7 +95,7 @@ public function getShippingFormFields($jsLayout, $numStreetLines){
         ['shippingAddress']['children']['shipping-address-fieldset']['children']['street']['children'][0]['validation'] = ['required-entry' => true, "min_text_len‌​gth" => 1, "max_text_length" => 255];
 
         // Street Line 1
-        if($this->helper->getConfig("brazilcustomerattributes/general/line_number") && $numStreetLines >= 2){
+        if($this->helper->getConfig("brazilcustomerattributes/general/line_number") && $numStreetLines >= 2) {
             $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
             ['shippingAddress']['children']['shipping-address-fieldset']['children']['street']['children'][1]['label'] = __('Number');
             $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
@@ -150,10 +163,10 @@ public function getShippingFormFields($jsLayout, $numStreetLines){
         return $jsLayout;
     }
 
-    public function getBillingFormFields($jsLayout, $numStreetLines){
-        if(isset($jsLayout['components']['checkout']['children']['steps']['children']
-            ['billing-step']['children']['payment']['children']
-            ['payments-list'])) {
+    public function getBillingFormFields($jsLayout, $numStreetLines)
+    {
+        if(isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']['payment']['children']['payments-list'])
+        ) {
 
             $paymentForms = $jsLayout['components']['checkout']['children']['steps']['children']
             ['billing-step']['children']['payment']['children']
@@ -163,8 +176,8 @@ public function getBillingFormFields($jsLayout, $numStreetLines){
 
                 $paymentMethodCode = str_replace('-form', '', $paymentMethodForm);
 
-                if (!isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
-                    ['payment']['children']['payments-list']['children'][$paymentMethodCode . '-form'])) {
+                if (!isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']['payment']['children']['payments-list']['children'][$paymentMethodCode . '-form'])
+                ) {
                     continue;
                 }
 
diff --git a/etc/di.xml b/etc/di.xml
index 75ab14c..8219b30 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Checkout\Block\Checkout\LayoutProcessor">
-        <plugin name="rewrite-street" type="SystemCode\BrazilCustomerAttributes\Model\Checkout\LayoutProcessorPlugin" sortOrder="10"/>
+        <plugin name="rewrite-street" type="SystemCode\BrazilCustomerAttributes\Plugin\Checkout\LayoutProcessor" sortOrder="10"/>
     </type>
     <type name="Magento\Quote\Model\BillingAddressManagement">
         <plugin disabled="false" name="copy-billing" sortOrder="10" type="SystemCode\BrazilCustomerAttributes\Plugin\Quote\BillingAddressManagement"/>