diff --git a/lib/abstractfactory/mainabstractfactory.php b/lib/AbstractFactory/MainAbstractFactory.php
similarity index 100%
rename from lib/abstractfactory/mainabstractfactory.php
rename to lib/AbstractFactory/MainAbstractFactory.php
diff --git a/lib/ajax/bxnullable.php b/lib/Ajax/BxNullable.php
similarity index 100%
rename from lib/ajax/bxnullable.php
rename to lib/Ajax/BxNullable.php
diff --git a/lib/app/app.php b/lib/App/App.php
similarity index 99%
rename from lib/app/app.php
rename to lib/App/App.php
index d5a7262..100a7f2 100644
--- a/lib/app/app.php
+++ b/lib/App/App.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Bx\Nullable\App;
 
-
 use Bx\Nullable\Facade\DefaultDefines;
 use Bx\Nullable\Facade\Defines;
 use Bx\Nullable\Facade\DefaultServiceFacade;
diff --git a/lib/collection/nullablecollection.php b/lib/Collection/NullableCollection.php
similarity index 100%
rename from lib/collection/nullablecollection.php
rename to lib/Collection/NullableCollection.php
diff --git a/lib/entity/nullableentity.php b/lib/Entity/NullableEntity.php
similarity index 100%
rename from lib/entity/nullableentity.php
rename to lib/Entity/NullableEntity.php
diff --git a/lib/facade/defaultdefines.php b/lib/Facade/DefaultDefines.php
similarity index 100%
rename from lib/facade/defaultdefines.php
rename to lib/Facade/DefaultDefines.php
diff --git a/lib/facade/defaultfactoryfacade.php b/lib/Facade/DefaultFactoryFacade.php
similarity index 100%
rename from lib/facade/defaultfactoryfacade.php
rename to lib/Facade/DefaultFactoryFacade.php
diff --git a/lib/facade/defaultservicefacade.php b/lib/Facade/DefaultServiceFacade.php
similarity index 100%
rename from lib/facade/defaultservicefacade.php
rename to lib/Facade/DefaultServiceFacade.php
diff --git a/lib/factory/nullablefactory.php b/lib/Factory/NullableFactory.php
similarity index 99%
rename from lib/factory/nullablefactory.php
rename to lib/Factory/NullableFactory.php
index 873d56a..147aa60 100644
--- a/lib/factory/nullablefactory.php
+++ b/lib/Factory/NullableFactory.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Bx\Nullable\Factory;
 
-
 use Bx\Nullable\Collection\NullableCollection;
 use Bx\Nullable\Entity\NullableEntity;
 use Bx\Nullable\ORM\NullableTable;
diff --git a/lib/ifields/nullablefields.php b/lib/IFields/NullableFields.php
similarity index 100%
rename from lib/ifields/nullablefields.php
rename to lib/IFields/NullableFields.php
diff --git a/lib/orm/nullabletable.php b/lib/ORM/NullableTable.php
similarity index 77%
rename from lib/orm/nullabletable.php
rename to lib/ORM/NullableTable.php
index f27ac4b..ab5541a 100644
--- a/lib/orm/nullabletable.php
+++ b/lib/ORM/NullableTable.php
@@ -1,11 +1,10 @@
 <?php
 
-
 namespace Bx\Nullable\ORM;
 
-
 use Bitrix\Main\ORM\Fields\DatetimeField;
 use Bitrix\Main\Type\DateTime;
+use Exception;
 use Wt\Core\ORM\ADataManager;
 
 class NullableTable extends ADataManager
@@ -33,7 +32,7 @@ class NullableTable extends ADataManager
 
     public static function getMap()
     {
-        return array(
+        return [
             'ID' => new \Bitrix\Main\Entity\IntegerField('ID', [
                 'primary' => true,
                 'autocomplete' => true,
@@ -47,39 +46,39 @@ class NullableTable extends ADataManager
                 'title' => 'UpdatedAt',
                 'user_edit' => false,
             ]),
-        );
+        ];
     }
 
-
     /**
-     * @param $id
-     * @param array $fields
+     * @param $primary
+     * @param array $data
      * @return \Bitrix\Main\ORM\Data\UpdateResult
      * @throws \Bitrix\Main\ObjectException
+     * @throws Exception
      */
-    public static function update($id, array $fields)
+    public static function update($primary, array $data)
     {
         foreach (static::getEntity()->getFields() as $field){
             if(is_a($field, DatetimeField::class)){
-                if(isset($fields[$field->getName()]) && !is_a($fields[$field->getName()], DateTime::class)) {
-                    $fields[$field->getName()] = new \Bitrix\Main\Type\DateTime($fields[$field->getName()]);
+                if(isset($data[$field->getName()]) && !is_a($data[$field->getName()], DateTime::class)) {
+                    $data[$field->getName()] = new \Bitrix\Main\Type\DateTime($data[$field->getName()]);
                 }
             }
         }
 
-        $fields = array_merge($fields, [
+        $data = array_merge($data, [
             'UPDATED_AT' => new \Bitrix\Main\Type\DateTime(), // date(CDatabase::DateFormatToPHP(FORMAT_DATETIME))
         ]);
-        unset($fields['CREATED_AT']);
+        unset($data['CREATED_AT']);
 
-        $result = parent::update($id, $fields);
-        return $result;
+        return parent::update($primary, $data);
     }
 
     /**
      * @param array $fields
      * @return \Bitrix\Main\ORM\Data\AddResult
      * @throws \Bitrix\Main\ObjectException
+     * @throws Exception
      */
     public static function add(array $fields)
     {
@@ -88,7 +87,6 @@ class NullableTable extends ADataManager
             'UPDATED_AT' => new \Bitrix\Main\Type\DateTime(),
         ]);
 
-        $result = parent::add($fields);
-        return $result;
+        return parent::add($fields);
     }
 }
\ No newline at end of file
diff --git a/lib/providers/defaultfactoryprovider.php b/lib/Providers/DefaultFactoryProvider.php
similarity index 100%
rename from lib/providers/defaultfactoryprovider.php
rename to lib/Providers/DefaultFactoryProvider.php
diff --git a/lib/providers/defaultserviceprovider.php b/lib/Providers/DefaultServiceProvider.php
similarity index 100%
rename from lib/providers/defaultserviceprovider.php
rename to lib/Providers/DefaultServiceProvider.php