diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 8d909ef93bb2..82ff104c4e03 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -34,18 +34,7 @@ use Turbo124\Beacon\Facades\LightLogs;
 
 class LoginController extends BaseController
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
-    /*
+    /**
       * @OA\Tag(
       *     name="login",
       *     description="Authentication",
diff --git a/app/Http/Controllers/OpenAPI/AccountSchema.php b/app/Http/Controllers/OpenAPI/AccountSchema.php
index 79400ecb6e91..b78df617bf6a 100644
--- a/app/Http/Controllers/OpenAPI/AccountSchema.php
+++ b/app/Http/Controllers/OpenAPI/AccountSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Account",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ActivitySchema.php b/app/Http/Controllers/OpenAPI/ActivitySchema.php
index 198ef4cdfc8c..2c14067a2fa2 100644
--- a/app/Http/Controllers/OpenAPI/ActivitySchema.php
+++ b/app/Http/Controllers/OpenAPI/ActivitySchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Activity",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/BulkActionSchema.php b/app/Http/Controllers/OpenAPI/BulkActionSchema.php
index 62f2c9b40fc5..0a544861436a 100644
--- a/app/Http/Controllers/OpenAPI/BulkActionSchema.php
+++ b/app/Http/Controllers/OpenAPI/BulkActionSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="BulkAction",
  *   type="array",
diff --git a/app/Http/Controllers/OpenAPI/ClientContactSchema.php b/app/Http/Controllers/OpenAPI/ClientContactSchema.php
index 448032095eb2..632441ff6f91 100644
--- a/app/Http/Controllers/OpenAPI/ClientContactSchema.php
+++ b/app/Http/Controllers/OpenAPI/ClientContactSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="ClientContact",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ClientGatewayToken.php b/app/Http/Controllers/OpenAPI/ClientGatewayToken.php
index f8c50aa8c2c0..a9b4dd7df9b6 100644
--- a/app/Http/Controllers/OpenAPI/ClientGatewayToken.php
+++ b/app/Http/Controllers/OpenAPI/ClientGatewayToken.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="ClientGatewayToken",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ClientSchema.php b/app/Http/Controllers/OpenAPI/ClientSchema.php
index 0f085149cb71..1bfa27aa44e1 100644
--- a/app/Http/Controllers/OpenAPI/ClientSchema.php
+++ b/app/Http/Controllers/OpenAPI/ClientSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Client",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php b/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
index 0b3d9be07f0e..a5009d01b461 100644
--- a/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CompanyGateway",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanyLedgerSchema.php b/app/Http/Controllers/OpenAPI/CompanyLedgerSchema.php
index 9f74a4a324b7..cdab901d31d7 100644
--- a/app/Http/Controllers/OpenAPI/CompanyLedgerSchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyLedgerSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CompanyLedger",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanySchema.php b/app/Http/Controllers/OpenAPI/CompanySchema.php
index 7e02183606f9..8eaf9293c228 100644
--- a/app/Http/Controllers/OpenAPI/CompanySchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanySchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Company",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanySettingsSchema.php b/app/Http/Controllers/OpenAPI/CompanySettingsSchema.php
index af9c0a2acf4f..fe19347cc086 100644
--- a/app/Http/Controllers/OpenAPI/CompanySettingsSchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanySettingsSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CompanySettings",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanyTokenSchema.php b/app/Http/Controllers/OpenAPI/CompanyTokenSchema.php
index cfa6acaed8fc..192eb3fbf54f 100644
--- a/app/Http/Controllers/OpenAPI/CompanyTokenSchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyTokenSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CompanyToken",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CompanyUserSchema.php b/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
index 1b58cca4d78b..5a77131d252e 100644
--- a/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
@@ -1,5 +1,5 @@
  <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CompanyUser",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CreditPaymentableSchema.php b/app/Http/Controllers/OpenAPI/CreditPaymentableSchema.php
index ef90e6b0708c..e05ff50a8552 100644
--- a/app/Http/Controllers/OpenAPI/CreditPaymentableSchema.php
+++ b/app/Http/Controllers/OpenAPI/CreditPaymentableSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="CreditPaymentable",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/CreditSchema.php b/app/Http/Controllers/OpenAPI/CreditSchema.php
index e925490b1775..3917f7faa1dc 100644
--- a/app/Http/Controllers/OpenAPI/CreditSchema.php
+++ b/app/Http/Controllers/OpenAPI/CreditSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Credit",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/DesignSchema.php b/app/Http/Controllers/OpenAPI/DesignSchema.php
index d811c39f0c51..ecfde1bc3cc9 100644
--- a/app/Http/Controllers/OpenAPI/DesignSchema.php
+++ b/app/Http/Controllers/OpenAPI/DesignSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Design",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ErrorSchema.php b/app/Http/Controllers/OpenAPI/ErrorSchema.php
index 420426932a2b..8f9b46e3c481 100644
--- a/app/Http/Controllers/OpenAPI/ErrorSchema.php
+++ b/app/Http/Controllers/OpenAPI/ErrorSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Error",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ExpenseSchema.php b/app/Http/Controllers/OpenAPI/ExpenseSchema.php
index 767a42c66b41..50f8366eb902 100644
--- a/app/Http/Controllers/OpenAPI/ExpenseSchema.php
+++ b/app/Http/Controllers/OpenAPI/ExpenseSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Expense",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/FeesAndLimitsSchema.php b/app/Http/Controllers/OpenAPI/FeesAndLimitsSchema.php
index 21953ed376a1..eaeaec5ca708 100644
--- a/app/Http/Controllers/OpenAPI/FeesAndLimitsSchema.php
+++ b/app/Http/Controllers/OpenAPI/FeesAndLimitsSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="FeesAndLimits",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/GroupSettingSchema.php b/app/Http/Controllers/OpenAPI/GroupSettingSchema.php
index 3962ec69ca9b..2da966cd3c24 100644
--- a/app/Http/Controllers/OpenAPI/GroupSettingSchema.php
+++ b/app/Http/Controllers/OpenAPI/GroupSettingSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="GroupSetting",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/Headers.php b/app/Http/Controllers/OpenAPI/Headers.php
index 8b4ff70d5cc5..b9aef8924c2d 100644
--- a/app/Http/Controllers/OpenAPI/Headers.php
+++ b/app/Http/Controllers/OpenAPI/Headers.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Header(
  *     header="X-MINIMUM-CLIENT-VERSION",
  *     description="The API version",
diff --git a/app/Http/Controllers/OpenAPI/InvoicePaymentableSchema.php b/app/Http/Controllers/OpenAPI/InvoicePaymentableSchema.php
index 92b113510cd6..311088cbb79c 100644
--- a/app/Http/Controllers/OpenAPI/InvoicePaymentableSchema.php
+++ b/app/Http/Controllers/OpenAPI/InvoicePaymentableSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="InvoicePaymentable",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/InvoiceSchema.php b/app/Http/Controllers/OpenAPI/InvoiceSchema.php
index aa22a0a1d705..6eb2d0e21e35 100644
--- a/app/Http/Controllers/OpenAPI/InvoiceSchema.php
+++ b/app/Http/Controllers/OpenAPI/InvoiceSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Invoice",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/Parameters.php b/app/Http/Controllers/OpenAPI/Parameters.php
index 77662fa1fb49..6cce8170694a 100644
--- a/app/Http/Controllers/OpenAPI/Parameters.php
+++ b/app/Http/Controllers/OpenAPI/Parameters.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  *     @OA\Parameter(
  *         name="X-Api-Secret",
  *         in="header",
diff --git a/app/Http/Controllers/OpenAPI/PaymentSchema.php b/app/Http/Controllers/OpenAPI/PaymentSchema.php
index be231038a75a..98b681a625d4 100644
--- a/app/Http/Controllers/OpenAPI/PaymentSchema.php
+++ b/app/Http/Controllers/OpenAPI/PaymentSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Payment",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/PaymentTermSchema.php b/app/Http/Controllers/OpenAPI/PaymentTermSchema.php
index d652119df4f7..f1faa5f6cce1 100644
--- a/app/Http/Controllers/OpenAPI/PaymentTermSchema.php
+++ b/app/Http/Controllers/OpenAPI/PaymentTermSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="PaymentTerm",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/PaymentableSchema.php b/app/Http/Controllers/OpenAPI/PaymentableSchema.php
index 6b22e086cc80..357dc40c5fac 100644
--- a/app/Http/Controllers/OpenAPI/PaymentableSchema.php
+++ b/app/Http/Controllers/OpenAPI/PaymentableSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Paymentable",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ProductSchema.php b/app/Http/Controllers/OpenAPI/ProductSchema.php
index c2f0337d4442..506fd381f4e2 100644
--- a/app/Http/Controllers/OpenAPI/ProductSchema.php
+++ b/app/Http/Controllers/OpenAPI/ProductSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Product",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ProjectSchema.php b/app/Http/Controllers/OpenAPI/ProjectSchema.php
new file mode 100644
index 000000000000..a3455a16b0bf
--- /dev/null
+++ b/app/Http/Controllers/OpenAPI/ProjectSchema.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * @OA\Schema(
+ *   schema="Project",
+ *   type="object",
+ *       @OA\Property(property="id", type="string", example="Opnel5aKBz", description="______"),
+ *       @OA\Property(property="name", type="string", example="New Project", description="______"),
+ * )
+ */
diff --git a/app/Http/Controllers/OpenAPI/QuoteSchema.php b/app/Http/Controllers/OpenAPI/QuoteSchema.php
index 41b158683762..10118f74892d 100644
--- a/app/Http/Controllers/OpenAPI/QuoteSchema.php
+++ b/app/Http/Controllers/OpenAPI/QuoteSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Quote",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/RecurringInvoice.php b/app/Http/Controllers/OpenAPI/RecurringInvoice.php
index ef9cec7f98a9..81e71de1c54c 100644
--- a/app/Http/Controllers/OpenAPI/RecurringInvoice.php
+++ b/app/Http/Controllers/OpenAPI/RecurringInvoice.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="RecurringInvoice",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/RecurringQuote.php b/app/Http/Controllers/OpenAPI/RecurringQuote.php
index 0ce87b1f4c58..7d752a184844 100644
--- a/app/Http/Controllers/OpenAPI/RecurringQuote.php
+++ b/app/Http/Controllers/OpenAPI/RecurringQuote.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="RecurringQuote",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/SystemLogSchema.php b/app/Http/Controllers/OpenAPI/SystemLogSchema.php
index 9ccea919afa7..878b05177dd9 100644
--- a/app/Http/Controllers/OpenAPI/SystemLogSchema.php
+++ b/app/Http/Controllers/OpenAPI/SystemLogSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="SystemLog",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/TaxRateSchema.php b/app/Http/Controllers/OpenAPI/TaxRateSchema.php
index 671561aed4e4..5e0b7f882896 100644
--- a/app/Http/Controllers/OpenAPI/TaxRateSchema.php
+++ b/app/Http/Controllers/OpenAPI/TaxRateSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="TaxRate",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/TemplateSchema.php b/app/Http/Controllers/OpenAPI/TemplateSchema.php
index 55c8959fe629..4ff9ae1ea57f 100644
--- a/app/Http/Controllers/OpenAPI/TemplateSchema.php
+++ b/app/Http/Controllers/OpenAPI/TemplateSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Template",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/UserSchema.php b/app/Http/Controllers/OpenAPI/UserSchema.php
index 211ac645f998..fd0a571d8b3f 100644
--- a/app/Http/Controllers/OpenAPI/UserSchema.php
+++ b/app/Http/Controllers/OpenAPI/UserSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="User",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/ValidationErrorSchema.php b/app/Http/Controllers/OpenAPI/ValidationErrorSchema.php
index 76b2f29fa51e..8965d9cf3b24 100644
--- a/app/Http/Controllers/OpenAPI/ValidationErrorSchema.php
+++ b/app/Http/Controllers/OpenAPI/ValidationErrorSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="ValidationError",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/VendorContact.php b/app/Http/Controllers/OpenAPI/VendorContact.php
index 0e1653f4fff9..f078087f9ccc 100644
--- a/app/Http/Controllers/OpenAPI/VendorContact.php
+++ b/app/Http/Controllers/OpenAPI/VendorContact.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="VendorContact",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/VendorSchema.php b/app/Http/Controllers/OpenAPI/VendorSchema.php
index 38e25e6d1460..bfc7968d9748 100644
--- a/app/Http/Controllers/OpenAPI/VendorSchema.php
+++ b/app/Http/Controllers/OpenAPI/VendorSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Vendor",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/WebhookSchema.php b/app/Http/Controllers/OpenAPI/WebhookSchema.php
index 4e910fbe5648..210e1ade77c5 100644
--- a/app/Http/Controllers/OpenAPI/WebhookSchema.php
+++ b/app/Http/Controllers/OpenAPI/WebhookSchema.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\Schema(
  *   schema="Webhook",
  *   type="object",
diff --git a/app/Http/Controllers/OpenAPI/swagger-v3.php b/app/Http/Controllers/OpenAPI/swagger-v3.php
index 236b098766e2..310fa73d90bf 100644
--- a/app/Http/Controllers/OpenAPI/swagger-v3.php
+++ b/app/Http/Controllers/OpenAPI/swagger-v3.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @OA\OpenApi(
  *     @OA\Info(
  *         version="1.0.30",
@@ -15,8 +15,8 @@
  *         )
  *     ),
  *     @OA\Server(
- *         description="InvoiceNinja host",
- *         url="https://virtserver.swaggerhub.com/InvoiceNinja/invoices/1.0.30"
+ *         description="Example InvoiceNinja base url",
+ *         url="https://ninja.test"
  *     ),
  *     @OA\ExternalDocumentation(
  *         description="http://docs.invoiceninja.com",