diff --git a/codbex-methods/codbex-methods.edm b/codbex-methods/codbex-methods.edm
index ed4db74..fd41c2f 100644
--- a/codbex-methods/codbex-methods.edm
+++ b/codbex-methods/codbex-methods.edm
@@ -1,18 +1,19 @@
 <model>
  <entities>
-  <entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="SETTING" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE_MASTER" navigationPath="/Home" perspectiveName="Methods" perspectiveLabel="methods" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false">
+  <entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="SETTING" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE" navigationPath="/Home" perspectiveName="PaymentMethod" perspectiveLabel="PaymentMethod" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false" generateDefaultRoles="false">
     <property name="Id" description="" tooltip="" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="PAYMENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
-  <entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="SETTING" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE_MASTER" navigationPath="/Home" perspectiveName="Methods" perspectiveLabel="methods" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveRole="" generateReport="false">
+  <entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="SETTING" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE" navigationPath="/Home" perspectiveName="SentMethod" perspectiveLabel="SentMethod" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="200" perspectiveRole="" generateReport="false" generateDefaultRoles="false">
     <property name="Id" description="" tooltip="" dataName="SENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="SENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
  </entities>
  <perspectives>
-  <perspective><name>Methods</name><label>methods</label><icon>/services/web/resources/unicons/archive.svg</icon><order>100</order><role></role></perspective>
+  <perspective><name>PaymentMethod</name><label>PaymentMethod</label><icon>/services/web/resources/unicons/archive.svg</icon><order>100</order><role></role></perspective>
+  <perspective><name>SentMethod</name><label>SentMethod</label><icon>/services/web/resources/unicons/archive.svg</icon><order>200</order><role></role></perspective>
  </perspectives>
  <navigations>
  </navigations>
- <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" title="PaymentMethod" caption="Manage entity PaymentMethod" tooltip="PaymentMethod" menuLabel="PaymentMethod" type="Entity" menuKey="paymentmethod" disableGeneration="false" perspectiveName="Methods" entityType="SETTING" description="Manage entity PaymentMethod" layoutType="MANAGE_MASTER" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="390" y="130" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="PAYMENTMETHOD_NAME" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" title="SentMethod" caption="Manage entity SentMethod" tooltip="SentMethod" menuLabel="SentMethod" type="Entity" menuKey="sentmethod" disableGeneration="false" perspectiveName="Methods" entityType="SETTING" description="Manage entity SentMethod" layoutType="MANAGE_MASTER" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="750" y="130" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="SENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="SENTMETHOD_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell></root></mxGraphModel>
+ <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" title="PaymentMethod" caption="Manage entity PaymentMethod" tooltip="PaymentMethod" menuLabel="PaymentMethod" type="Entity" menuKey="paymentmethod" disableGeneration="false" perspectiveName="PaymentMethod" entityType="SETTING" description="Manage entity PaymentMethod" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="20" y="80" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="PAYMENTMETHOD_NAME" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" title="SentMethod" caption="Manage entity SentMethod" tooltip="SentMethod" menuLabel="SentMethod" type="Entity" menuKey="sentmethod" disableGeneration="false" perspectiveName="SentMethod" entityType="SETTING" description="Manage entity SentMethod" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="280" y="80" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="SENTMETHOD_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="SENTMETHOD_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell></root></mxGraphModel>
 </model>
\ No newline at end of file
diff --git a/codbex-methods/codbex-methods.gen b/codbex-methods/codbex-methods.gen
index ff5d76b..e9cecbd 100644
--- a/codbex-methods/codbex-methods.gen
+++ b/codbex-methods/codbex-methods.gen
@@ -7,113 +7,31 @@
   "dataSource": "DefaultDB",
   "fileName": "codbex-methods",
   "genFolderName": "codbex-methods",
+  "roles": [],
   "projectName": "codbex-methods",
   "workspaceName": "workspace",
   "filePath": "codbex-methods.model",
   "templateId": "template-application-angular/template/template.js",
   "perspectives": {
-    "Methods": {
+    "PaymentMethod": {
       "views": [
-        "PaymentMethod",
-        "SentMethod",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details",
-        "PaymentMethod-details",
-        "SentMethod-details"
+        "PaymentMethod"
       ],
-      "name": "Methods",
-      "label": "Methods",
+      "name": "PaymentMethod",
+      "label": "PaymentMethod",
       "order": "100",
       "icon": "/services/web/resources/unicons/archive.svg",
       "role": ""
+    },
+    "SentMethod": {
+      "views": [
+        "SentMethod"
+      ],
+      "name": "SentMethod",
+      "label": "SentMethod",
+      "order": "200",
+      "icon": "/services/web/resources/unicons/archive.svg",
+      "role": ""
     }
   },
   "models": [
@@ -174,17 +92,18 @@
       "dataName": "PAYMENTMETHOD",
       "dataQuery": "",
       "description": "Manage entity PaymentMethod",
+      "generateDefaultRoles": "false",
       "generateReport": "false",
       "icon": "/services/web/resources/unicons/file.svg",
-      "layoutType": "MANAGE_MASTER",
+      "layoutType": "MANAGE",
       "menuIndex": "100",
       "menuKey": "paymentmethod",
       "menuLabel": "PaymentMethod",
       "name": "PaymentMethod",
       "navigationPath": "/Home",
       "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
-      "perspectiveLabel": "methods",
-      "perspectiveName": "Methods",
+      "perspectiveLabel": "PaymentMethod",
+      "perspectiveName": "PaymentMethod",
       "perspectiveOrder": "100",
       "perspectiveRole": "",
       "title": "PaymentMethod",
@@ -195,36 +114,7 @@
       "primaryKeys": [
         "Id"
       ],
-      "primaryKeysString": "Id",
-      "masterProperties": {
-        "title": {
-          "dataLength": "20",
-          "dataName": "PAYMENTMETHOD_NAME",
-          "dataNullable": true,
-          "dataType": "VARCHAR",
-          "description": "",
-          "name": "Name",
-          "tooltip": "",
-          "widgetIsMajor": true,
-          "widgetLength": "20",
-          "widgetSize": "",
-          "widgetType": "TEXTBOX",
-          "dataNotNull": false,
-          "dataAutoIncrement": false,
-          "dataPrimaryKey": false,
-          "dataUnique": false,
-          "isRequiredProperty": false,
-          "isCalculatedProperty": false,
-          "widgetLabel": "Name",
-          "widgetDropdownUrl": "",
-          "dataTypeJava": "string",
-          "dataTypeTypescript": "string",
-          "minLength": 0,
-          "maxLength": 20,
-          "inputRule": ""
-        },
-        "properties": []
-      }
+      "primaryKeysString": "Id"
     },
     {
       "properties": [
@@ -283,18 +173,19 @@
       "dataName": "SENTMETHOD",
       "dataQuery": "",
       "description": "Manage entity SentMethod",
+      "generateDefaultRoles": "false",
       "generateReport": "false",
       "icon": "/services/web/resources/unicons/file.svg",
-      "layoutType": "MANAGE_MASTER",
+      "layoutType": "MANAGE",
       "menuIndex": "100",
       "menuKey": "sentmethod",
       "menuLabel": "SentMethod",
       "name": "SentMethod",
       "navigationPath": "/Home",
       "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
-      "perspectiveLabel": "methods",
-      "perspectiveName": "Methods",
-      "perspectiveOrder": "100",
+      "perspectiveLabel": "SentMethod",
+      "perspectiveName": "SentMethod",
+      "perspectiveOrder": "200",
       "perspectiveRole": "",
       "title": "SentMethod",
       "tooltip": "SentMethod",
@@ -304,36 +195,7 @@
       "primaryKeys": [
         "Id"
       ],
-      "primaryKeysString": "Id",
-      "masterProperties": {
-        "title": {
-          "dataLength": "20",
-          "dataName": "SENTMETHOD_NAME",
-          "dataNullable": true,
-          "dataType": "VARCHAR",
-          "description": "",
-          "name": "Name",
-          "tooltip": "",
-          "widgetIsMajor": true,
-          "widgetLength": "20",
-          "widgetSize": "",
-          "widgetType": "TEXTBOX",
-          "dataNotNull": false,
-          "dataAutoIncrement": false,
-          "dataPrimaryKey": false,
-          "dataUnique": false,
-          "isRequiredProperty": false,
-          "isCalculatedProperty": false,
-          "widgetLabel": "Name",
-          "widgetDropdownUrl": "",
-          "dataTypeJava": "string",
-          "dataTypeTypescript": "string",
-          "minLength": 0,
-          "maxLength": 20,
-          "inputRule": ""
-        },
-        "properties": []
-      }
+      "primaryKeysString": "Id"
     }
   ]
 }
\ No newline at end of file
diff --git a/codbex-methods/codbex-methods.model b/codbex-methods/codbex-methods.model
index 2388c58..e170d1c 100644
--- a/codbex-methods/codbex-methods.model
+++ b/codbex-methods/codbex-methods.model
@@ -36,17 +36,18 @@
                 "dataName": "PAYMENTMETHOD",
                 "dataQuery": "",
                 "description": "Manage entity PaymentMethod",
+                "generateDefaultRoles": "false",
                 "generateReport": "false",
                 "icon": "/services/web/resources/unicons/file.svg",
-                "layoutType": "MANAGE_MASTER",
+                "layoutType": "MANAGE",
                 "menuIndex": "100",
                 "menuKey": "paymentmethod",
                 "menuLabel": "PaymentMethod",
                 "name": "PaymentMethod",
                 "navigationPath": "/Home",
                 "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
-                "perspectiveLabel": "methods",
-                "perspectiveName": "Methods",
+                "perspectiveLabel": "PaymentMethod",
+                "perspectiveName": "PaymentMethod",
                 "perspectiveOrder": "100",
                 "perspectiveRole": "",
                 "title": "PaymentMethod",
@@ -88,18 +89,19 @@
                 "dataName": "SENTMETHOD",
                 "dataQuery": "",
                 "description": "Manage entity SentMethod",
+                "generateDefaultRoles": "false",
                 "generateReport": "false",
                 "icon": "/services/web/resources/unicons/file.svg",
-                "layoutType": "MANAGE_MASTER",
+                "layoutType": "MANAGE",
                 "menuIndex": "100",
                 "menuKey": "sentmethod",
                 "menuLabel": "SentMethod",
                 "name": "SentMethod",
                 "navigationPath": "/Home",
                 "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
-                "perspectiveLabel": "methods",
-                "perspectiveName": "Methods",
-                "perspectiveOrder": "100",
+                "perspectiveLabel": "SentMethod",
+                "perspectiveName": "SentMethod",
+                "perspectiveOrder": "200",
                 "perspectiveRole": "",
                 "title": "SentMethod",
                 "tooltip": "SentMethod",
@@ -108,11 +110,18 @@
         ],
         "perspectives": [
             {
-                "name": "Methods",
-                "label": "methods",
+                "name": "PaymentMethod",
+                "label": "PaymentMethod",
                 "icon": "/services/web/resources/unicons/archive.svg",
                 "order": "100",
                 "role": {}
+            },
+            {
+                "name": "SentMethod",
+                "label": "SentMethod",
+                "icon": "/services/web/resources/unicons/archive.svg",
+                "order": "200",
+                "role": {}
             }
         ],
         "navigations": []
diff --git a/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts b/codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts
similarity index 94%
rename from codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts
rename to codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts
index eb1d21f..ce22952 100644
--- a/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts
+++ b/codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts
@@ -1,10 +1,10 @@
 import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
 import { Extensions } from "sdk/extensions"
-import { PaymentMethodRepository, PaymentMethodEntityOptions } from "../../dao/Methods/PaymentMethodRepository";
+import { PaymentMethodRepository, PaymentMethodEntityOptions } from "../../dao/PaymentMethod/PaymentMethodRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
 
-const validationModules = await Extensions.loadExtensionModules("codbex-methods-Methods-PaymentMethod", ["validate"]);
+const validationModules = await Extensions.loadExtensionModules("codbex-methods-PaymentMethod-PaymentMethod", ["validate"]);
 
 @Controller
 class PaymentMethodService {
@@ -30,7 +30,7 @@ class PaymentMethodService {
         try {
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity);
-            response.setHeader("Content-Location", "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts/" + entity.Id);
+            response.setHeader("Content-Location", "/services/ts/codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts/" + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts b/codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts
similarity index 95%
rename from codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts
rename to codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts
index d6ec720..f3df4ae 100644
--- a/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts
+++ b/codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts
@@ -1,10 +1,10 @@
 import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
 import { Extensions } from "sdk/extensions"
-import { SentMethodRepository, SentMethodEntityOptions } from "../../dao/Methods/SentMethodRepository";
+import { SentMethodRepository, SentMethodEntityOptions } from "../../dao/SentMethod/SentMethodRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
 
-const validationModules = await Extensions.loadExtensionModules("codbex-methods-Methods-SentMethod", ["validate"]);
+const validationModules = await Extensions.loadExtensionModules("codbex-methods-SentMethod-SentMethod", ["validate"]);
 
 @Controller
 class SentMethodService {
@@ -30,7 +30,7 @@ class SentMethodService {
         try {
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity);
-            response.setHeader("Content-Location", "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts/" + entity.Id);
+            response.setHeader("Content-Location", "/services/ts/codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts/" + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-methods/gen/codbex-methods/codbex-methods.openapi b/codbex-methods/gen/codbex-methods/codbex-methods.openapi
index c67c994..84520ca 100644
--- a/codbex-methods/gen/codbex-methods/codbex-methods.openapi
+++ b/codbex-methods/gen/codbex-methods/codbex-methods.openapi
@@ -9,10 +9,10 @@ externalDocs:
 servers:
   - url: /services/ts
 tags:
-  - name: Methods
-  - name: Methods
+  - name: PaymentMethod
+  - name: SentMethod
 paths:
-  /codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts:
+  /codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts:
     get:
       summary: List PaymentMethod
       parameters:
@@ -33,7 +33,7 @@ paths:
             type: integer
             allowEmptyValue: true
       tags:
-        - Methods
+        - PaymentMethod
       responses:
         200:
           description: Successful Request
@@ -64,7 +64,7 @@ paths:
     post:
       summary: Create PaymentMethod
       tags:
-        - Methods
+        - PaymentMethod
       requestBody:
         content:
           application/json:
@@ -96,7 +96,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts/{id}:
+  /codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts/{id}:
     get:
       summary: Get PaymentMethod by Id
       parameters:
@@ -107,7 +107,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - PaymentMethod
       responses:
         200:
           description: Successful Request
@@ -145,7 +145,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - PaymentMethod
       requestBody:
         content:
           application/json:
@@ -193,7 +193,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - PaymentMethod
       responses:
         204:
           description: Successful Request
@@ -215,11 +215,11 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts/count:
+  /codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts/count:
     get:
       summary: Count the number of PaymentMethod
       tags:
-        - Methods
+        - PaymentMethod
       responses:
         200:
           description: Successful Request
@@ -243,7 +243,7 @@ paths:
     post:
       summary: Count the number of PaymentMethod by PaymentMethodFilterOptions
       tags:
-        - Methods
+        - PaymentMethod
       requestBody:
         content:
           application/json:
@@ -325,11 +325,11 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts/search:
+  /codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts/search:
     post:
       summary: Search PaymentMethod by PaymentMethodFilterOptions
       tags:
-        - Methods
+        - PaymentMethod
       requestBody:
         content:
           application/json:
@@ -412,7 +412,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts:
+  /codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts:
     get:
       summary: List SentMethod
       parameters:
@@ -433,7 +433,7 @@ paths:
             type: integer
             allowEmptyValue: true
       tags:
-        - Methods
+        - SentMethod
       responses:
         200:
           description: Successful Request
@@ -464,7 +464,7 @@ paths:
     post:
       summary: Create SentMethod
       tags:
-        - Methods
+        - SentMethod
       requestBody:
         content:
           application/json:
@@ -496,7 +496,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts/{id}:
+  /codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts/{id}:
     get:
       summary: Get SentMethod by Id
       parameters:
@@ -507,7 +507,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - SentMethod
       responses:
         200:
           description: Successful Request
@@ -545,7 +545,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - SentMethod
       requestBody:
         content:
           application/json:
@@ -593,7 +593,7 @@ paths:
           schema:
             type: string
       tags:
-        - Methods
+        - SentMethod
       responses:
         204:
           description: Successful Request
@@ -615,11 +615,11 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts/count:
+  /codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts/count:
     get:
       summary: Count the number of SentMethod
       tags:
-        - Methods
+        - SentMethod
       responses:
         200:
           description: Successful Request
@@ -643,7 +643,7 @@ paths:
     post:
       summary: Count the number of SentMethod by SentMethodFilterOptions
       tags:
-        - Methods
+        - SentMethod
       requestBody:
         content:
           application/json:
@@ -725,11 +725,11 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts/search:
+  /codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts/search:
     post:
       summary: Search SentMethod by SentMethodFilterOptions
       tags:
-        - Methods
+        - SentMethod
       requestBody:
         content:
           application/json:
diff --git a/codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethod.extensionpoint b/codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethod.extensionpoint
deleted file mode 100644
index 2c8e571..0000000
--- a/codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethod.extensionpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "codbex-methods-Methods-PaymentMethod",
-    "description": "Extension Point for the codbex-methods-Methods-PaymentMethod entity"
-}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/dao/Methods/SentMethod.extensionpoint b/codbex-methods/gen/codbex-methods/dao/Methods/SentMethod.extensionpoint
deleted file mode 100644
index b49c82d..0000000
--- a/codbex-methods/gen/codbex-methods/dao/Methods/SentMethod.extensionpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "codbex-methods-Methods-SentMethod",
-    "description": "Extension Point for the codbex-methods-Methods-SentMethod entity"
-}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethod.extensionpoint b/codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethod.extensionpoint
new file mode 100644
index 0000000..00bbce9
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethod.extensionpoint
@@ -0,0 +1,4 @@
+{
+    "name": "codbex-methods-PaymentMethod-PaymentMethod",
+    "description": "Extension Point for the codbex-methods-PaymentMethod-PaymentMethod entity"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethodRepository.ts b/codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethodRepository.ts
similarity index 97%
rename from codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethodRepository.ts
rename to codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethodRepository.ts
index 2c2a806..9f5c31b 100644
--- a/codbex-methods/gen/codbex-methods/dao/Methods/PaymentMethodRepository.ts
+++ b/codbex-methods/gen/codbex-methods/dao/PaymentMethod/PaymentMethodRepository.ts
@@ -182,7 +182,7 @@ export class PaymentMethodRepository {
     }
 
     private async triggerEvent(data: PaymentMethodEntityEvent | PaymentMethodUpdateEntityEvent) {
-        const triggerExtensions = await extensions.loadExtensionModules("codbex-methods-Methods-PaymentMethod", ["trigger"]);
+        const triggerExtensions = await extensions.loadExtensionModules("codbex-methods-PaymentMethod-PaymentMethod", ["trigger"]);
         triggerExtensions.forEach(triggerExtension => {
             try {
                 triggerExtension.trigger(data);
@@ -190,6 +190,6 @@ export class PaymentMethodRepository {
                 console.error(error);
             }            
         });
-        producer.topic("codbex-methods-Methods-PaymentMethod").send(JSON.stringify(data));
+        producer.topic("codbex-methods-PaymentMethod-PaymentMethod").send(JSON.stringify(data));
     }
 }
diff --git a/codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethod.extensionpoint b/codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethod.extensionpoint
new file mode 100644
index 0000000..05ef0fe
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethod.extensionpoint
@@ -0,0 +1,4 @@
+{
+    "name": "codbex-methods-SentMethod-SentMethod",
+    "description": "Extension Point for the codbex-methods-SentMethod-SentMethod entity"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/dao/Methods/SentMethodRepository.ts b/codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethodRepository.ts
similarity index 97%
rename from codbex-methods/gen/codbex-methods/dao/Methods/SentMethodRepository.ts
rename to codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethodRepository.ts
index 3b61100..9e32bff 100644
--- a/codbex-methods/gen/codbex-methods/dao/Methods/SentMethodRepository.ts
+++ b/codbex-methods/gen/codbex-methods/dao/SentMethod/SentMethodRepository.ts
@@ -182,7 +182,7 @@ export class SentMethodRepository {
     }
 
     private async triggerEvent(data: SentMethodEntityEvent | SentMethodUpdateEntityEvent) {
-        const triggerExtensions = await extensions.loadExtensionModules("codbex-methods-Methods-SentMethod", ["trigger"]);
+        const triggerExtensions = await extensions.loadExtensionModules("codbex-methods-SentMethod-SentMethod", ["trigger"]);
         triggerExtensions.forEach(triggerExtension => {
             try {
                 triggerExtension.trigger(data);
@@ -190,6 +190,6 @@ export class SentMethodRepository {
                 console.error(error);
             }            
         });
-        producer.topic("codbex-methods-Methods-SentMethod").send(JSON.stringify(data));
+        producer.topic("codbex-methods-SentMethod-SentMethod").send(JSON.stringify(data));
     }
 }
diff --git a/codbex-methods/gen/codbex-methods/roles/default-roles.roles b/codbex-methods/gen/codbex-methods/roles/default-roles.roles
new file mode 100644
index 0000000..32960f8
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/roles/default-roles.roles
@@ -0,0 +1,2 @@
+[
+]
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension
deleted file mode 100644
index af63753..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.extension
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "module": "codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.js",
-    "extensionPoint": "dialog-window",
-    "description": "codbex-methods - Application Dialog Window"
-}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension
deleted file mode 100644
index 2a666c0..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js","extensionPoint":"dialog-window","description":"codbex-methods - Application Dialog Window"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html
deleted file mode 100644
index 2a51c7b..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
-
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
-		<title dg-brand-title></title>
-		<theme></theme>
-		<script type="text/javascript"
-			src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
-		<link type="text/css" rel="stylesheet"
-			href="/services/js/resources-core/services/loader.js?id=application-view-css" />
-		<script type="text/javascript" src="controller.js"></script>
-	</head>
-
-	<body class="dg-vbox">
-		<fd-toolbar has-title="true">
-			<fd-toolbar-title>Items <span fd-object-status text="{{dataCount}}" inverted="true"></fd-toolbar-title>
-			<fd-toolbar-spacer></fd-toolbar-spacer>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--add"
-				state="{{action == 'update'? 'disabled' : ''}}" ng-click="createEntity()"></fd-button>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--edit"
-				state="{{selectedEntity == null ? 'disabled' : ''}}" ng-click="updateEntity()"></fd-button>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--delete"
-				state="{{selectedEntity == null || action == 'update'? 'disabled' : ''}}" ng-click="deleteEntity()">
-			</fd-button>
-			<fd-popover>
-				<fd-popover-control>
-					<fd-button compact="true" glyph="sap-icon--overflow" dg-type="transparent"
-						aria-label="Header Menu Button">
-					</fd-button>
-				</fd-popover-control>
-				<fd-popover-body dg-align="bottom-right">
-					<fd-menu aria-label="Header Menu" no-backdrop="true" no-shadow="true">
-						<fd-menu-item title="Filter" ng-click="openFilter()"></fd-menu-item>
-						<fd-menu-item ng-repeat="action in pageActions" title="{{action.label}}"
-							ng-click="triggerPageAction(action)"></fd-menu-item>
-					</fd-menu>
-				</fd-popover-body>
-			</fd-popover>
-		</fd-toolbar>
-		<fd-scrollbar>
-			<fd-list list-type="navigation-indication" byline="true" state="disabled">
-				<fd-list-item ng-repeat="next in data">
-					<fd-list-link navigation-indicator="true" dg-selected="next.Id === selectedEntity.Id"
-						navigated="next.Id === selectedEntity.Id"
-						ng-click="action == 'select' ? selectEntity(next) : ''">
-						<fd-list-content
-							item-title="{{next.Name}}">
-							<fd-list-byline dg-align="left">
-							</fd-list-byline>
-						</fd-list-content>
-					</fd-list-link>
-				</fd-list-item>
-			</fd-list>
-			<fd-list-action-item ng-show="dataPage <= dataPages && dataCount > dataLimit" ng-click="loadPage()">
-				Load More ...
-			</fd-list-action-item>
-		</fd-scrollbar>
-	</body>
-
-</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js
deleted file mode 100644
index 2b0b2bf..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/controller.js
+++ /dev/null
@@ -1,112 +0,0 @@
-angular.module('page', ["ideUI", "ideView", "entityApi"])
-	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.PaymentMethod';
-	}])
-	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts";
-	}])
-	.controller('PageController', ['$scope',  'Extensions', 'messageHub', 'entityApi', function ($scope,  Extensions, messageHub, entityApi) {
-
-		$scope.entity = {};
-		$scope.forms = {
-			details: {},
-		};
-		$scope.formHeaders = {
-			select: "PaymentMethod Details",
-			create: "Create PaymentMethod",
-			update: "Update PaymentMethod"
-		};
-		$scope.action = 'select';
-
-		//-----------------Custom Actions-------------------//
-		Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) {
-			$scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "PaymentMethod" && e.type === "entity");
-		});
-
-		$scope.triggerEntityAction = function (action) {
-			messageHub.showDialogWindow(
-				action.id,
-				{
-					id: $scope.entity.Id
-				},
-				null,
-				true,
-				action
-			);
-		};
-		//-----------------Custom Actions-------------------//
-
-		//-----------------Events-------------------//
-		messageHub.onDidReceiveMessage("clearDetails", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = {};
-				$scope.action = 'select';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("entitySelected", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = msg.data.entity;
-				$scope.action = 'select';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("createEntity", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = {};
-				$scope.action = 'create';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("updateEntity", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = msg.data.entity;
-				$scope.action = 'update';
-			});
-		});
-
-
-		//-----------------Events-------------------//
-
-		$scope.create = function () {
-			entityApi.create($scope.entity).then(function (response) {
-				if (response.status != 201) {
-					messageHub.showAlertError("PaymentMethod", `Unable to create PaymentMethod: '${response.message}'`);
-					return;
-				}
-				messageHub.postMessage("entityCreated", response.data);
-				messageHub.postMessage("clearDetails", response.data);
-				messageHub.showAlertSuccess("PaymentMethod", "PaymentMethod successfully created");
-			});
-		};
-
-		$scope.update = function () {
-			entityApi.update($scope.entity.Id, $scope.entity).then(function (response) {
-				if (response.status != 200) {
-					messageHub.showAlertError("PaymentMethod", `Unable to update PaymentMethod: '${response.message}'`);
-					return;
-				}
-				messageHub.postMessage("entityUpdated", response.data);
-				messageHub.postMessage("clearDetails", response.data);
-				messageHub.showAlertSuccess("PaymentMethod", "PaymentMethod successfully updated");
-			});
-		};
-
-		$scope.cancel = function () {
-			messageHub.postMessage("clearDetails");
-		};
-		
-		//-----------------Dialogs-------------------//
-		
-
-		//-----------------Dialogs-------------------//
-
-
-
-		//----------------Dropdowns-----------------//
-
-
-		//----------------Dropdowns-----------------//	
-		
-
-	}]);
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html
deleted file mode 100644
index 0202678..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
-
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
-        <title dg-brand-title></title>
-        <theme></theme>
-        <script type="text/javascript"
-            src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
-        <link type="text/css" rel="stylesheet"
-            href="/services/js/resources-core/services/loader.js?id=application-view-css" />
-        <script type="text/javascript" src="controller.js"></script>
-    </head>
-
-    <body class="dg-vbox">
-        <fd-scrollbar class="dg-full-height">
-            <fd-fieldset ng-form="forms.details">
-                <fd-form-group dg-header="{{formHeaders[action]}}" name="entityForm" class="fd-container fd-form-layout-grid-container">
-                    <fd-form-item class="fd-row">
-                    	<div class="fd-col fd-col-md--2">
-                        	<fd-form-label for="idName" dg-required="false" dg-colon="true">Name</fd-form-label>
-                        </div>
-                        <div class="fd-col  fd-col-md--8 ">
-	                        <fd-form-input-message-group dg-inactive="{{ forms.details['Name'].$valid }}">
-	                            <fd-input id="idName"
-	                                name="Name"
-	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
-									ng-required="false"
-	                                ng-model="entity.Name"
-	                                ng-readonly="action === 'select'"
-	                                ng-minlength="0.0 || 0"
-	                                ng-maxlength="20.0 || -1"
-	                                dg-input-rules="{ patterns: [''] }"
-	                                type="text"
-	                                placeholder="Enter Name">
-	                            </fd-input>
-	                            <fd-form-message dg-type="error">The value doesn't match the required pattern ''</fd-form-message>
-	                        </fd-form-input-message-group>
-	                        <i class="sap-icon--information" role="presentation" onclick="javascript:alert('')"></i>
-	                    </div>
-                    </fd-form-item>
-                </fd-form-group>
-            </fd-fieldset>
-        </fd-scrollbar>
-
-		<fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
-			<fd-bar-right>
-				<fd-bar-element>
-					<fd-button dg-label="{{action === 'create' ? 'Create' : 'Update'}}" dg-type="emphasized" ng-click="action === 'create' ? create() : update()" state="{{ forms.details.$valid ? '' : 'disabled' }}"></fd-button>
-				</fd-bar-element>
-				<fd-bar-element>
-					<fd-button dg-label="Cancel" ng-click="cancel()"></fd-button>
-				</fd-bar-element>
-			</fd-bar-right>
-		</fd-bar>
-		<fd-bar bar-design="footer" ng-show="action === 'select' && entityActions.length && entity.Id">
-			<fd-bar-right>
-				<fd-bar-element ng-repeat="action in entityActions">
-					<fd-button dg-label="{{action.label}}" compact="true" ng-click="triggerEntityAction(action)"></fd-button>
-				</fd-bar-element>
-			</fd-bar-right>
-		</fd-bar>
-    </body>
-
-</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension
deleted file mode 100644
index 2ffed86..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View - Main Details"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js
deleted file mode 100644
index 9cc22ba..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/view.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Generated by Eclipse Dirigible based on model and template.
- *
- * Do not modify the content as it may be re-generated again.
- */
-const viewData = {
-    id: "PaymentMethod-details",
-    label: "PaymentMethod",
-    factory: "frame",
-    region: "center",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/main-details/index.html",
-    perspectiveName: "Methods",
-};
-
-if (typeof exports !== 'undefined') {
-    exports.getView = function () {
-        return viewData;
-    }
-}
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile-portal.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile-portal.extension
deleted file mode 100644
index df9d0fd..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile-portal.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.js","extensionPoint":"portal-tile","description":"codbex-methods - Application Tile"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.extension
deleted file mode 100644
index 158f58c..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.js","extensionPoint":"codbex-methods-tile","description":"codbex-methods - Application Tile"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.extension
deleted file mode 100644
index 2f796d9..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension
deleted file mode 100644
index f97755f..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.extension
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "module": "codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.js",
-    "extensionPoint": "dialog-window",
-    "description": "codbex-methods - Application Dialog Window"
-}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension
deleted file mode 100644
index 8de2428..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js","extensionPoint":"dialog-window","description":"codbex-methods - Application Dialog Window"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html
deleted file mode 100644
index 2a51c7b..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
-
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
-		<title dg-brand-title></title>
-		<theme></theme>
-		<script type="text/javascript"
-			src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
-		<link type="text/css" rel="stylesheet"
-			href="/services/js/resources-core/services/loader.js?id=application-view-css" />
-		<script type="text/javascript" src="controller.js"></script>
-	</head>
-
-	<body class="dg-vbox">
-		<fd-toolbar has-title="true">
-			<fd-toolbar-title>Items <span fd-object-status text="{{dataCount}}" inverted="true"></fd-toolbar-title>
-			<fd-toolbar-spacer></fd-toolbar-spacer>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--add"
-				state="{{action == 'update'? 'disabled' : ''}}" ng-click="createEntity()"></fd-button>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--edit"
-				state="{{selectedEntity == null ? 'disabled' : ''}}" ng-click="updateEntity()"></fd-button>
-			<fd-button compact="true" dg-type="transparent" glyph="sap-icon--delete"
-				state="{{selectedEntity == null || action == 'update'? 'disabled' : ''}}" ng-click="deleteEntity()">
-			</fd-button>
-			<fd-popover>
-				<fd-popover-control>
-					<fd-button compact="true" glyph="sap-icon--overflow" dg-type="transparent"
-						aria-label="Header Menu Button">
-					</fd-button>
-				</fd-popover-control>
-				<fd-popover-body dg-align="bottom-right">
-					<fd-menu aria-label="Header Menu" no-backdrop="true" no-shadow="true">
-						<fd-menu-item title="Filter" ng-click="openFilter()"></fd-menu-item>
-						<fd-menu-item ng-repeat="action in pageActions" title="{{action.label}}"
-							ng-click="triggerPageAction(action)"></fd-menu-item>
-					</fd-menu>
-				</fd-popover-body>
-			</fd-popover>
-		</fd-toolbar>
-		<fd-scrollbar>
-			<fd-list list-type="navigation-indication" byline="true" state="disabled">
-				<fd-list-item ng-repeat="next in data">
-					<fd-list-link navigation-indicator="true" dg-selected="next.Id === selectedEntity.Id"
-						navigated="next.Id === selectedEntity.Id"
-						ng-click="action == 'select' ? selectEntity(next) : ''">
-						<fd-list-content
-							item-title="{{next.Name}}">
-							<fd-list-byline dg-align="left">
-							</fd-list-byline>
-						</fd-list-content>
-					</fd-list-link>
-				</fd-list-item>
-			</fd-list>
-			<fd-list-action-item ng-show="dataPage <= dataPages && dataCount > dataLimit" ng-click="loadPage()">
-				Load More ...
-			</fd-list-action-item>
-		</fd-scrollbar>
-	</body>
-
-</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js
deleted file mode 100644
index 4964282..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/controller.js
+++ /dev/null
@@ -1,112 +0,0 @@
-angular.module('page', ["ideUI", "ideView", "entityApi"])
-	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.SentMethod';
-	}])
-	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts";
-	}])
-	.controller('PageController', ['$scope',  'Extensions', 'messageHub', 'entityApi', function ($scope,  Extensions, messageHub, entityApi) {
-
-		$scope.entity = {};
-		$scope.forms = {
-			details: {},
-		};
-		$scope.formHeaders = {
-			select: "SentMethod Details",
-			create: "Create SentMethod",
-			update: "Update SentMethod"
-		};
-		$scope.action = 'select';
-
-		//-----------------Custom Actions-------------------//
-		Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) {
-			$scope.entityActions = response.filter(e => e.perspective === "Methods" && e.view === "SentMethod" && e.type === "entity");
-		});
-
-		$scope.triggerEntityAction = function (action) {
-			messageHub.showDialogWindow(
-				action.id,
-				{
-					id: $scope.entity.Id
-				},
-				null,
-				true,
-				action
-			);
-		};
-		//-----------------Custom Actions-------------------//
-
-		//-----------------Events-------------------//
-		messageHub.onDidReceiveMessage("clearDetails", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = {};
-				$scope.action = 'select';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("entitySelected", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = msg.data.entity;
-				$scope.action = 'select';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("createEntity", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = {};
-				$scope.action = 'create';
-			});
-		});
-
-		messageHub.onDidReceiveMessage("updateEntity", function (msg) {
-			$scope.$apply(function () {
-				$scope.entity = msg.data.entity;
-				$scope.action = 'update';
-			});
-		});
-
-
-		//-----------------Events-------------------//
-
-		$scope.create = function () {
-			entityApi.create($scope.entity).then(function (response) {
-				if (response.status != 201) {
-					messageHub.showAlertError("SentMethod", `Unable to create SentMethod: '${response.message}'`);
-					return;
-				}
-				messageHub.postMessage("entityCreated", response.data);
-				messageHub.postMessage("clearDetails", response.data);
-				messageHub.showAlertSuccess("SentMethod", "SentMethod successfully created");
-			});
-		};
-
-		$scope.update = function () {
-			entityApi.update($scope.entity.Id, $scope.entity).then(function (response) {
-				if (response.status != 200) {
-					messageHub.showAlertError("SentMethod", `Unable to update SentMethod: '${response.message}'`);
-					return;
-				}
-				messageHub.postMessage("entityUpdated", response.data);
-				messageHub.postMessage("clearDetails", response.data);
-				messageHub.showAlertSuccess("SentMethod", "SentMethod successfully updated");
-			});
-		};
-
-		$scope.cancel = function () {
-			messageHub.postMessage("clearDetails");
-		};
-		
-		//-----------------Dialogs-------------------//
-		
-
-		//-----------------Dialogs-------------------//
-
-
-
-		//----------------Dropdowns-----------------//
-
-
-		//----------------Dropdowns-----------------//	
-		
-
-	}]);
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html
deleted file mode 100644
index 0202678..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
-
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
-        <title dg-brand-title></title>
-        <theme></theme>
-        <script type="text/javascript"
-            src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
-        <link type="text/css" rel="stylesheet"
-            href="/services/js/resources-core/services/loader.js?id=application-view-css" />
-        <script type="text/javascript" src="controller.js"></script>
-    </head>
-
-    <body class="dg-vbox">
-        <fd-scrollbar class="dg-full-height">
-            <fd-fieldset ng-form="forms.details">
-                <fd-form-group dg-header="{{formHeaders[action]}}" name="entityForm" class="fd-container fd-form-layout-grid-container">
-                    <fd-form-item class="fd-row">
-                    	<div class="fd-col fd-col-md--2">
-                        	<fd-form-label for="idName" dg-required="false" dg-colon="true">Name</fd-form-label>
-                        </div>
-                        <div class="fd-col  fd-col-md--8 ">
-	                        <fd-form-input-message-group dg-inactive="{{ forms.details['Name'].$valid }}">
-	                            <fd-input id="idName"
-	                                name="Name"
-	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
-									ng-required="false"
-	                                ng-model="entity.Name"
-	                                ng-readonly="action === 'select'"
-	                                ng-minlength="0.0 || 0"
-	                                ng-maxlength="20.0 || -1"
-	                                dg-input-rules="{ patterns: [''] }"
-	                                type="text"
-	                                placeholder="Enter Name">
-	                            </fd-input>
-	                            <fd-form-message dg-type="error">The value doesn't match the required pattern ''</fd-form-message>
-	                        </fd-form-input-message-group>
-	                        <i class="sap-icon--information" role="presentation" onclick="javascript:alert('')"></i>
-	                    </div>
-                    </fd-form-item>
-                </fd-form-group>
-            </fd-fieldset>
-        </fd-scrollbar>
-
-		<fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
-			<fd-bar-right>
-				<fd-bar-element>
-					<fd-button dg-label="{{action === 'create' ? 'Create' : 'Update'}}" dg-type="emphasized" ng-click="action === 'create' ? create() : update()" state="{{ forms.details.$valid ? '' : 'disabled' }}"></fd-button>
-				</fd-bar-element>
-				<fd-bar-element>
-					<fd-button dg-label="Cancel" ng-click="cancel()"></fd-button>
-				</fd-bar-element>
-			</fd-bar-right>
-		</fd-bar>
-		<fd-bar bar-design="footer" ng-show="action === 'select' && entityActions.length && entity.Id">
-			<fd-bar-right>
-				<fd-bar-element ng-repeat="action in entityActions">
-					<fd-button dg-label="{{action.label}}" compact="true" ng-click="triggerEntityAction(action)"></fd-button>
-				</fd-bar-element>
-			</fd-bar-right>
-		</fd-bar>
-    </body>
-
-</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension
deleted file mode 100644
index 675f8cc..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View - Main Details"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js
deleted file mode 100644
index 84c4bb7..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/view.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Generated by Eclipse Dirigible based on model and template.
- *
- * Do not modify the content as it may be re-generated again.
- */
-const viewData = {
-    id: "SentMethod-details",
-    label: "SentMethod",
-    factory: "frame",
-    region: "center",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/main-details/index.html",
-    perspectiveName: "Methods",
-};
-
-if (typeof exports !== 'undefined') {
-    exports.getView = function () {
-        return viewData;
-    }
-}
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile-portal.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile-portal.extension
deleted file mode 100644
index 8c543cb..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile-portal.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.js","extensionPoint":"portal-tile","description":"codbex-methods - Application Tile"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.extension
deleted file mode 100644
index 22c3378..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.js","extensionPoint":"codbex-methods-tile","description":"codbex-methods - Application Tile"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.extension b/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.extension
deleted file mode 100644
index d5170f4..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js","extensionPoint":"codbex-methods-view","description":"codbex-methods - Application View"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/perspective-portal.extension b/codbex-methods/gen/codbex-methods/ui/Methods/perspective-portal.extension
deleted file mode 100644
index beea229..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/perspective-portal.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/perspective.js","extensionPoint":"portal","description":"codbex-methods - Perspective - Methods"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/perspective.extension b/codbex-methods/gen/codbex-methods/ui/Methods/perspective.extension
deleted file mode 100644
index b0c15f1..0000000
--- a/codbex-methods/gen/codbex-methods/ui/Methods/perspective.extension
+++ /dev/null
@@ -1 +0,0 @@
-{"module":"codbex-methods/gen/codbex-methods/ui/Methods/perspective.js","extensionPoint":"codbex-methods","description":"codbex-methods - Perspective - Methods"}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/controller.js
similarity index 66%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/controller.js
index 881248d..426c85f 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/controller.js
@@ -1,21 +1,20 @@
 angular.module('page', ["ideUI", "ideView", "entityApi"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.PaymentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.PaymentMethod.PaymentMethod';
 	}])
 	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts";
+		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts";
 	}])
 	.controller('PageController', ['$scope', 'messageHub', 'entityApi', 'Extensions', function ($scope, messageHub, entityApi, Extensions) {
 
 		$scope.dataPage = 1;
 		$scope.dataCount = 0;
-		$scope.dataOffset = 0;
-		$scope.dataLimit = 10;
-		$scope.action = "select";
+		$scope.dataLimit = 20;
 
 		//-----------------Custom Actions-------------------//
 		Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) {
-			$scope.pageActions = response.filter(e => e.perspective === "Methods" && e.view === "PaymentMethod" && (e.type === "page" || e.type === undefined));
+			$scope.pageActions = response.filter(e => e.perspective === "PaymentMethod" && e.view === "PaymentMethod" && (e.type === "page" || e.type === undefined));
+			$scope.entityActions = response.filter(e => e.perspective === "PaymentMethod" && e.view === "PaymentMethod" && e.type === "entity");
 		});
 
 		$scope.triggerPageAction = function (action) {
@@ -27,35 +26,33 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 				action
 			);
 		};
-		//-----------------Custom Actions-------------------//
 
-		function refreshData() {
-			$scope.dataReset = true;
-			$scope.dataPage--;
-		}
+		$scope.triggerEntityAction = function (action) {
+			messageHub.showDialogWindow(
+				action.id,
+				{
+					id: $scope.entity.Id
+				},
+				null,
+				true,
+				action
+			);
+		};
+		//-----------------Custom Actions-------------------//
 
 		function resetPagination() {
-			$scope.dataReset = true;
 			$scope.dataPage = 1;
 			$scope.dataCount = 0;
-			$scope.dataLimit = 10;
+			$scope.dataLimit = 20;
 		}
+		resetPagination();
 
 		//-----------------Events-------------------//
-		messageHub.onDidReceiveMessage("clearDetails", function (msg) {
-			$scope.$apply(function () {
-				$scope.selectedEntity = null;
-				$scope.action = "select";
-			});
-		});
-
 		messageHub.onDidReceiveMessage("entityCreated", function (msg) {
-			refreshData();
 			$scope.loadPage($scope.dataPage, $scope.filter);
 		});
 
 		messageHub.onDidReceiveMessage("entityUpdated", function (msg) {
-			refreshData();
 			$scope.loadPage($scope.dataPage, $scope.filter);
 		});
 
@@ -71,10 +68,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 			if (!filter && $scope.filter) {
 				filter = $scope.filter;
 			}
-			if (!filter) {
-				filter = {};
-			}
-			$scope.selectedEntity = null;
+			$scope.dataPage = pageNumber;
 			entityApi.count(filter).then(function (response) {
 				if (response.status != 200) {
 					messageHub.showAlertError("PaymentMethod", `Unable to count PaymentMethod: '${response.message}'`);
@@ -83,25 +77,22 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 				if (response.data) {
 					$scope.dataCount = response.data;
 				}
-				$scope.dataPages = Math.ceil($scope.dataCount / $scope.dataLimit);
-				filter.$offset = ($scope.dataPage - 1) * $scope.dataLimit;
-				filter.$limit = $scope.dataLimit;
-				if ($scope.dataReset) {
-					filter.$offset = 0;
-					filter.$limit = $scope.dataPage * $scope.dataLimit;
+				let offset = (pageNumber - 1) * $scope.dataLimit;
+				let limit = $scope.dataLimit;
+				let request;
+				if (filter) {
+					filter.$offset = offset;
+					filter.$limit = limit;
+					request = entityApi.search(filter);
+				} else {
+					request = entityApi.list(offset, limit);
 				}
-
-				entityApi.search(filter).then(function (response) {
+				request.then(function (response) {
 					if (response.status != 200) {
 						messageHub.showAlertError("PaymentMethod", `Unable to list/filter PaymentMethod: '${response.message}'`);
 						return;
 					}
-					if ($scope.data == null || $scope.dataReset) {
-						$scope.data = [];
-						$scope.dataReset = false;
-					}
-					$scope.data = $scope.data.concat(response.data);
-					$scope.dataPage++;
+					$scope.data = response.data;
 				});
 			});
 		};
@@ -109,28 +100,39 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 
 		$scope.selectEntity = function (entity) {
 			$scope.selectedEntity = entity;
-			messageHub.postMessage("entitySelected", {
+		};
+
+		$scope.openDetails = function (entity) {
+			$scope.selectedEntity = entity;
+			messageHub.showDialogWindow("PaymentMethod-details", {
+				action: "select",
 				entity: entity,
-				selectedMainEntityId: entity.Id,
+			});
+		};
+
+		$scope.openFilter = function (entity) {
+			messageHub.showDialogWindow("PaymentMethod-filter", {
+				entity: $scope.filterEntity,
 			});
 		};
 
 		$scope.createEntity = function () {
 			$scope.selectedEntity = null;
-			$scope.action = "create";
-
-			messageHub.postMessage("createEntity");
+			messageHub.showDialogWindow("PaymentMethod-details", {
+				action: "create",
+				entity: {},
+			}, null, false);
 		};
 
-		$scope.updateEntity = function () {
-			$scope.action = "update";
-			messageHub.postMessage("updateEntity", {
-				entity: $scope.selectedEntity,
-			});
+		$scope.updateEntity = function (entity) {
+			messageHub.showDialogWindow("PaymentMethod-details", {
+				action: "update",
+				entity: entity,
+			}, null, false);
 		};
 
-		$scope.deleteEntity = function () {
-			let id = $scope.selectedEntity.Id;
+		$scope.deleteEntity = function (entity) {
+			let id = entity.Id;
 			messageHub.showDialogAsync(
 				'Delete PaymentMethod?',
 				`Are you sure you want to delete PaymentMethod? This action cannot be undone.`,
@@ -151,7 +153,6 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 							messageHub.showAlertError("PaymentMethod", `Unable to delete PaymentMethod: '${response.message}'`);
 							return;
 						}
-						refreshData();
 						$scope.loadPage($scope.dataPage, $scope.filter);
 						messageHub.postMessage("clearDetails");
 					});
@@ -159,10 +160,4 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 			});
 		};
 
-		$scope.openFilter = function (entity) {
-			messageHub.showDialogWindow("PaymentMethod-filter", {
-				entity: $scope.filterEntity,
-			});
-		};
-
 	}]);
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/controller.js
similarity index 92%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/controller.js
index bccec6d..c4667e2 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/controller.js
@@ -1,6 +1,6 @@
 angular.module('page', ["ideUI", "ideView"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.PaymentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.PaymentMethod.PaymentMethod';
 	}])
 	.controller('PageController', ['$scope', 'messageHub', 'ViewParameters', function ($scope, messageHub, ViewParameters) {
 
@@ -46,7 +46,6 @@ angular.module('page', ["ideUI", "ideView"])
 				entity: entity,
 				filter: filter
 			});
-			messageHub.postMessage("clearDetails");
 			$scope.cancel();
 		};
 
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/index.html
similarity index 97%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/index.html
index 0cebf03..61d0d86 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/index.html
@@ -50,7 +50,7 @@
             </fd-fieldset>
         </fd-scrollbar>
 
-        <fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
+		<fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<fd-bar-right>
 				<fd-bar-element>
 					<fd-button dg-label="Filter" dg-type="emphasized" ng-click="filter()"></fd-button>
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.extension
new file mode 100644
index 0000000..5fed98c
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.js",
+    "extensionPoint": "codbex-methods-dialog-window",
+    "description": "codbex-methods - Application Dialog Window"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.js
similarity index 68%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.js
index 1614533..f02580f 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/view.js
@@ -6,8 +6,8 @@
 const viewData = {
     id: "PaymentMethod-filter",
     label: "PaymentMethod Filter",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-filter/index.html",
-    perspectiveName: "Methods",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-filter/index.html",
+    perspectiveName: "PaymentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/controller.js
similarity index 93%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/controller.js
index 3973a0f..2cb3d04 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/controller.js
@@ -1,9 +1,9 @@
 angular.module('page', ["ideUI", "ideView", "entityApi"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.PaymentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.PaymentMethod.PaymentMethod';
 	}])
 	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/PaymentMethodService.ts";
+		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/PaymentMethod/PaymentMethodService.ts";
 	}])
 	.controller('PageController', ['$scope',  'messageHub', 'ViewParameters', 'entityApi', function ($scope,  messageHub, ViewParameters, entityApi) {
 
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/index.html
similarity index 100%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/index.html
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.extension
new file mode 100644
index 0000000..324ee28
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.js",
+    "extensionPoint": "codbex-methods-dialog-window",
+    "description": "codbex-methods - Application Dialog Window"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.js
similarity index 68%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.js
index e1eb781..f58d640 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/view.js
@@ -6,8 +6,8 @@
 const viewData = {
     id: "PaymentMethod-details",
     label: "PaymentMethod",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/dialog-window/index.html",
-    perspectiveName: "Methods",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/dialog-window/index.html",
+    perspectiveName: "PaymentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/index.html
new file mode 100644
index 0000000..12c215d
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/index.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
+
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
+		<title dg-brand-title></title>
+		<theme></theme>
+		<script type="text/javascript"
+			src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
+		<link type="text/css" rel="stylesheet"
+			href="/services/js/resources-core/services/loader.js?id=application-view-css" />
+		<script type="text/javascript" src="controller.js"></script>
+	</head>
+
+	<body class="dg-vbox">
+		<fd-toolbar has-title="true">
+			<fd-toolbar-title>Items <span fd-object-status text="{{dataCount}}" inverted="true"></fd-toolbar-title>
+			<fd-button compact="true" dg-type="transparent" dg-label="Filter" ng-click="openFilter()"></fd-button>
+			<fd-button ng-repeat="action in pageActions" compact="true" dg-type="transparent" dg-label="{{action.label}}" ng-click="triggerPageAction(action)"></fd-button>
+			<fd-toolbar-spacer></fd-toolbar-spacer>
+			<fd-button compact="true" dg-type="emphasized" dg-label="Create" ng-click="createEntity()"></fd-button>
+		</fd-toolbar>
+
+		<fd-scrollbar class="dg-full-height" ng-hide="data == null">
+			<table fd-table display-mode="compact" inner-borders="top" outer-borders="none">
+				<thead fd-table-header sticky="true">
+					<tr fd-table-row>
+						<th fd-table-header-cell>Name</th>
+						<th fd-table-header-cell></th>
+					</tr>
+				</thead>
+				<tbody fd-table-body>
+					<tr fd-table-row hoverable="true" ng-show="data.length == 0">
+						<td fd-table-cell no-data="true">No data available.</td>
+					</tr>
+					<tr fd-table-row hoverable="true" ng-repeat="next in data"
+						dg-selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
+						<td fd-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">{{next.Name}}</td>
+						<td fd-table-cell fit-content="true">
+							<fd-popover>
+								<fd-popover-control>
+									<fd-button compact="true" glyph="sap-icon--overflow" dg-type="transparent"
+										aria-label="Table Row Menu Button" ng-click="setTristate()">
+									</fd-button>
+								</fd-popover-control>
+								<fd-popover-body dg-align="bottom-right">
+									<fd-menu aria-label="Table Row Menu" no-backdrop="true" no-shadow="true">
+										<fd-menu-item ng-repeat="action in entityActions" title="{{action.label}}" ng-click="triggerEntityAction(action)"></fd-menu-item>
+										<fd-menu-item title="View Details" ng-click="openDetails(next)"></fd-menu-item>
+										<fd-menu-item title="Edit" ng-click="updateEntity(next)"></fd-menu-item>
+										<fd-menu-item title="Delete" ng-click="deleteEntity(next)"></fd-menu-item>
+									</fd-menu>
+								</fd-popover-body>
+							</fd-popover>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</fd-scrollbar>
+
+		<fd-pagination total-items="dataCount" items-per-page="dataLimit"
+			items-per-page-options="[10, 20, 50]" page-change="loadPage(pageNumber)"
+			items-per-page-change="loadPage(pageNumber)" items-per-page-placement="top-start" compact="true"
+			display-total-items="true" ng-hide="dataCount == 0">
+		</fd-pagination>
+	</body>
+
+</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile-portal.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile-portal.extension
new file mode 100644
index 0000000..e13a7a1
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile-portal.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.js",
+    "extensionPoint": "portal-tile",
+    "description": "codbex-methods - Application Tile"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.extension
new file mode 100644
index 0000000..f422298
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.js",
+    "extensionPoint": "codbex-methods-tile",
+    "description": "codbex-methods - Application Tile"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.js
similarity index 89%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.js
index 47c5a5a..2889045 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/tile.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/tile.js
@@ -12,8 +12,8 @@ exports.getTile = function () {
         type: "SETTING",
         report: "false",
         icon: "/services/web/resources/unicons/file.svg",
-        location: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/index.html",
+        location: "/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html",
         order: "100",
-        groupOrder: "100",
+        groupOrder: "100"
     };
-};
+}
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.extension
new file mode 100644
index 0000000..c10a250
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.js",
+    "extensionPoint": "codbex-methods-view",
+    "description": "codbex-methods - Application View"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.js
similarity index 67%
rename from codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.js
index 5cf6a65..9c08526 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: "PaymentMethod",
     label: "PaymentMethod",
     factory: "frame",
-    region: "left",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/PaymentMethod/index.html",
-    perspectiveName: "Methods",
+    region: "center",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/PaymentMethod/index.html",
+    perspectiveName: "PaymentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html
new file mode 100644
index 0000000..a6383b3
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html
@@ -0,0 +1,79 @@
+<!--
+
+    Generated by Eclipse Dirigible based on model and template.
+
+    Do not modify the content as it may be re-generated again.
+
+-->
+<!DOCTYPE html>
+<html lang="en" ng-app="app" ng-controller="ApplicationController" xmlns="http://www.w3.org/1999/xhtml">
+
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
+        <title dg-brand-title></title>
+        <script type="text/javascript" src="perspective.js"></script>
+        <theme></theme>
+        <script type="text/javascript"
+            src="/services/js/resources-core/services/loader.js?id=application-perspective-js">
+        </script>
+        <link type="text/css" rel="stylesheet"
+            href="/services/js/resources-core/services/loader.js?id=application-perspective-css" />
+    </head>
+
+    <body dg-embeddable-perspective>
+        <ide-header menu-ext-id="codbex-methods-menu"></ide-header>
+        <ide-container ng-if="!state.error && !state.isBusy">
+            <ide-layout views-layout-model="layoutModel"></ide-layout>
+        </ide-container>
+        <fd-busy-indicator-extended ng-if="!state.error && state.isBusy" class="dg-fill-parent" dg-size="l">
+            {{state.busyText}}
+        </fd-busy-indicator-extended>
+        <fd-message-page glyph="sap-icon--error" ng-if="state.error">
+            <fd-message-page-title>Encounterd an error while loading</fd-message-page-title>
+        </fd-message-page>
+        <ide-dialogs></ide-dialogs>
+        <ide-status-bar></ide-status-bar>
+        <script type="text/javascript">
+            angular.module('app', ['ngResource', 'ideLayout', 'ideUI', 'ideExtensions'])
+                .constant('branding', {
+                    name: 'Methods Managing module',
+                    brand: 'codbex',
+                    brandUrl: 'https://www.codbex.com/',
+                    icons: {
+                        faviconIco: '/services/web/ide-branding/images/favicon.ico',
+                        favicon32: '/services/web/ide-branding/images/favicon-32x32.png',
+                        favicon16: '/services/web/ide-branding/images/favicon-16x16.png',
+                    },
+                    logo: '/services/web/ide-branding/images/logo.svg',
+                })
+                .constant('extensionPoint', {
+                    perspectives: 'codbex-methods',
+                    views: 'codbex-methods-view',
+                    dialogWindows: 'dialog-window'
+                })
+                .controller('ApplicationController', ['$scope', 'messageHub', 'Extensions', function ($scope, messageHub, Extensions) {
+                    $scope.state = {
+                        isBusy: true,
+                        error: false,
+                        busyText: 'Loading...',
+                    };
+                    $scope.layoutModel = {
+                        views: []
+                    };
+                    Extensions.get('view', 'codbex-methods-view').then(function (response) {
+                        $scope.layoutModel = {
+                            views: response.filter(e => !e.isLaunchpad && e.perspectiveName === 'PaymentMethod').map(e => e.id)
+                        };
+                        $scope.state.isBusy = false;
+                    }, function (error) {
+                        console.error(error);
+                        $scope.state.error = true;
+                    });
+                }]);
+        </script>
+    </body>
+
+</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective-portal.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective-portal.extension
new file mode 100644
index 0000000..58a3b7d
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective-portal.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.js",
+    "extensionPoint": "portal",
+    "description": "codbex-methods - Perspective - PaymentMethod"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.extension b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.extension
new file mode 100644
index 0000000..6282ace
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.js",
+    "extensionPoint": "codbex-methods",
+    "description": "codbex-methods - Perspective - PaymentMethod"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/perspective.js b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.js
similarity index 72%
rename from codbex-methods/gen/codbex-methods/ui/Methods/perspective.js
rename to codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.js
index 81cda8d..619003d 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/perspective.js
+++ b/codbex-methods/gen/codbex-methods/ui/PaymentMethod/perspective.js
@@ -4,9 +4,9 @@
  * Do not modify the content as it may be re-generated again.
  */
 const perspectiveData = {
-	id: 'Methods',
-	name: 'methods',
-	link: '/services/web/codbex-methods/gen/codbex-methods/ui/Methods/index.html',
+	id: 'PaymentMethod',
+	name: 'PaymentMethod',
+	link: '/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html',
 	order: 100,
 	icon: '/services/web/resources/unicons/archive.svg',
 };
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/controller.js
similarity index 66%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/controller.js
index 3994a91..e4a900b 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/controller.js
@@ -1,21 +1,20 @@
 angular.module('page', ["ideUI", "ideView", "entityApi"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.SentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.SentMethod.SentMethod';
 	}])
 	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts";
+		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts";
 	}])
 	.controller('PageController', ['$scope', 'messageHub', 'entityApi', 'Extensions', function ($scope, messageHub, entityApi, Extensions) {
 
 		$scope.dataPage = 1;
 		$scope.dataCount = 0;
-		$scope.dataOffset = 0;
-		$scope.dataLimit = 10;
-		$scope.action = "select";
+		$scope.dataLimit = 20;
 
 		//-----------------Custom Actions-------------------//
 		Extensions.get('dialogWindow', 'codbex-methods-custom-action').then(function (response) {
-			$scope.pageActions = response.filter(e => e.perspective === "Methods" && e.view === "SentMethod" && (e.type === "page" || e.type === undefined));
+			$scope.pageActions = response.filter(e => e.perspective === "SentMethod" && e.view === "SentMethod" && (e.type === "page" || e.type === undefined));
+			$scope.entityActions = response.filter(e => e.perspective === "SentMethod" && e.view === "SentMethod" && e.type === "entity");
 		});
 
 		$scope.triggerPageAction = function (action) {
@@ -27,35 +26,33 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 				action
 			);
 		};
-		//-----------------Custom Actions-------------------//
 
-		function refreshData() {
-			$scope.dataReset = true;
-			$scope.dataPage--;
-		}
+		$scope.triggerEntityAction = function (action) {
+			messageHub.showDialogWindow(
+				action.id,
+				{
+					id: $scope.entity.Id
+				},
+				null,
+				true,
+				action
+			);
+		};
+		//-----------------Custom Actions-------------------//
 
 		function resetPagination() {
-			$scope.dataReset = true;
 			$scope.dataPage = 1;
 			$scope.dataCount = 0;
-			$scope.dataLimit = 10;
+			$scope.dataLimit = 20;
 		}
+		resetPagination();
 
 		//-----------------Events-------------------//
-		messageHub.onDidReceiveMessage("clearDetails", function (msg) {
-			$scope.$apply(function () {
-				$scope.selectedEntity = null;
-				$scope.action = "select";
-			});
-		});
-
 		messageHub.onDidReceiveMessage("entityCreated", function (msg) {
-			refreshData();
 			$scope.loadPage($scope.dataPage, $scope.filter);
 		});
 
 		messageHub.onDidReceiveMessage("entityUpdated", function (msg) {
-			refreshData();
 			$scope.loadPage($scope.dataPage, $scope.filter);
 		});
 
@@ -71,10 +68,7 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 			if (!filter && $scope.filter) {
 				filter = $scope.filter;
 			}
-			if (!filter) {
-				filter = {};
-			}
-			$scope.selectedEntity = null;
+			$scope.dataPage = pageNumber;
 			entityApi.count(filter).then(function (response) {
 				if (response.status != 200) {
 					messageHub.showAlertError("SentMethod", `Unable to count SentMethod: '${response.message}'`);
@@ -83,25 +77,22 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 				if (response.data) {
 					$scope.dataCount = response.data;
 				}
-				$scope.dataPages = Math.ceil($scope.dataCount / $scope.dataLimit);
-				filter.$offset = ($scope.dataPage - 1) * $scope.dataLimit;
-				filter.$limit = $scope.dataLimit;
-				if ($scope.dataReset) {
-					filter.$offset = 0;
-					filter.$limit = $scope.dataPage * $scope.dataLimit;
+				let offset = (pageNumber - 1) * $scope.dataLimit;
+				let limit = $scope.dataLimit;
+				let request;
+				if (filter) {
+					filter.$offset = offset;
+					filter.$limit = limit;
+					request = entityApi.search(filter);
+				} else {
+					request = entityApi.list(offset, limit);
 				}
-
-				entityApi.search(filter).then(function (response) {
+				request.then(function (response) {
 					if (response.status != 200) {
 						messageHub.showAlertError("SentMethod", `Unable to list/filter SentMethod: '${response.message}'`);
 						return;
 					}
-					if ($scope.data == null || $scope.dataReset) {
-						$scope.data = [];
-						$scope.dataReset = false;
-					}
-					$scope.data = $scope.data.concat(response.data);
-					$scope.dataPage++;
+					$scope.data = response.data;
 				});
 			});
 		};
@@ -109,28 +100,39 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 
 		$scope.selectEntity = function (entity) {
 			$scope.selectedEntity = entity;
-			messageHub.postMessage("entitySelected", {
+		};
+
+		$scope.openDetails = function (entity) {
+			$scope.selectedEntity = entity;
+			messageHub.showDialogWindow("SentMethod-details", {
+				action: "select",
 				entity: entity,
-				selectedMainEntityId: entity.Id,
+			});
+		};
+
+		$scope.openFilter = function (entity) {
+			messageHub.showDialogWindow("SentMethod-filter", {
+				entity: $scope.filterEntity,
 			});
 		};
 
 		$scope.createEntity = function () {
 			$scope.selectedEntity = null;
-			$scope.action = "create";
-
-			messageHub.postMessage("createEntity");
+			messageHub.showDialogWindow("SentMethod-details", {
+				action: "create",
+				entity: {},
+			}, null, false);
 		};
 
-		$scope.updateEntity = function () {
-			$scope.action = "update";
-			messageHub.postMessage("updateEntity", {
-				entity: $scope.selectedEntity,
-			});
+		$scope.updateEntity = function (entity) {
+			messageHub.showDialogWindow("SentMethod-details", {
+				action: "update",
+				entity: entity,
+			}, null, false);
 		};
 
-		$scope.deleteEntity = function () {
-			let id = $scope.selectedEntity.Id;
+		$scope.deleteEntity = function (entity) {
+			let id = entity.Id;
 			messageHub.showDialogAsync(
 				'Delete SentMethod?',
 				`Are you sure you want to delete SentMethod? This action cannot be undone.`,
@@ -151,7 +153,6 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 							messageHub.showAlertError("SentMethod", `Unable to delete SentMethod: '${response.message}'`);
 							return;
 						}
-						refreshData();
 						$scope.loadPage($scope.dataPage, $scope.filter);
 						messageHub.postMessage("clearDetails");
 					});
@@ -159,10 +160,4 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 			});
 		};
 
-		$scope.openFilter = function (entity) {
-			messageHub.showDialogWindow("SentMethod-filter", {
-				entity: $scope.filterEntity,
-			});
-		};
-
 	}]);
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/controller.js
similarity index 92%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/controller.js
index f0ff585..323081d 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/controller.js
@@ -1,6 +1,6 @@
 angular.module('page', ["ideUI", "ideView"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.SentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.SentMethod.SentMethod';
 	}])
 	.controller('PageController', ['$scope', 'messageHub', 'ViewParameters', function ($scope, messageHub, ViewParameters) {
 
@@ -46,7 +46,6 @@ angular.module('page', ["ideUI", "ideView"])
 				entity: entity,
 				filter: filter
 			});
-			messageHub.postMessage("clearDetails");
 			$scope.cancel();
 		};
 
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/index.html
similarity index 97%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/index.html
index 4ebf8bc..7f9a4d0 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/index.html
@@ -50,7 +50,7 @@
             </fd-fieldset>
         </fd-scrollbar>
 
-        <fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
+		<fd-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<fd-bar-right>
 				<fd-bar-element>
 					<fd-button dg-label="Filter" dg-type="emphasized" ng-click="filter()"></fd-button>
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.extension
new file mode 100644
index 0000000..afd1d1d
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.js",
+    "extensionPoint": "codbex-methods-dialog-window",
+    "description": "codbex-methods - Application Dialog Window"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.js
similarity index 69%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.js
index c6cd9d1..c0de89c 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/view.js
@@ -6,8 +6,8 @@
 const viewData = {
     id: "SentMethod-filter",
     label: "SentMethod Filter",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-filter/index.html",
-    perspectiveName: "Methods",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-filter/index.html",
+    perspectiveName: "SentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/controller.js
similarity index 94%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/controller.js
index 5470c22..05689ea 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/controller.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/controller.js
@@ -1,9 +1,9 @@
 angular.module('page', ["ideUI", "ideView", "entityApi"])
 	.config(["messageHubProvider", function (messageHubProvider) {
-		messageHubProvider.eventIdPrefix = 'codbex-methods.Methods.SentMethod';
+		messageHubProvider.eventIdPrefix = 'codbex-methods.SentMethod.SentMethod';
 	}])
 	.config(["entityApiProvider", function (entityApiProvider) {
-		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/Methods/SentMethodService.ts";
+		entityApiProvider.baseUrl = "/services/ts/codbex-methods/gen/codbex-methods/api/SentMethod/SentMethodService.ts";
 	}])
 	.controller('PageController', ['$scope',  'messageHub', 'ViewParameters', 'entityApi', function ($scope,  messageHub, ViewParameters, entityApi) {
 
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/index.html
similarity index 100%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/index.html
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.extension
new file mode 100644
index 0000000..e0208c5
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.js",
+    "extensionPoint": "codbex-methods-dialog-window",
+    "description": "codbex-methods - Application Dialog Window"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.js
similarity index 69%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.js
index 2de3adc..03d5122 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/view.js
@@ -6,8 +6,8 @@
 const viewData = {
     id: "SentMethod-details",
     label: "SentMethod",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/dialog-window/index.html",
-    perspectiveName: "Methods",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/dialog-window/index.html",
+    perspectiveName: "SentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/index.html b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/index.html
new file mode 100644
index 0000000..12c215d
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/index.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" ng-app="page" ng-controller="PageController">
+
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="icon" href="data:;base64,iVBORw0KGgo=" dg-brand-icon />
+		<title dg-brand-title></title>
+		<theme></theme>
+		<script type="text/javascript"
+			src="/services/js/resources-core/services/loader.js?id=application-view-js"></script>
+		<link type="text/css" rel="stylesheet"
+			href="/services/js/resources-core/services/loader.js?id=application-view-css" />
+		<script type="text/javascript" src="controller.js"></script>
+	</head>
+
+	<body class="dg-vbox">
+		<fd-toolbar has-title="true">
+			<fd-toolbar-title>Items <span fd-object-status text="{{dataCount}}" inverted="true"></fd-toolbar-title>
+			<fd-button compact="true" dg-type="transparent" dg-label="Filter" ng-click="openFilter()"></fd-button>
+			<fd-button ng-repeat="action in pageActions" compact="true" dg-type="transparent" dg-label="{{action.label}}" ng-click="triggerPageAction(action)"></fd-button>
+			<fd-toolbar-spacer></fd-toolbar-spacer>
+			<fd-button compact="true" dg-type="emphasized" dg-label="Create" ng-click="createEntity()"></fd-button>
+		</fd-toolbar>
+
+		<fd-scrollbar class="dg-full-height" ng-hide="data == null">
+			<table fd-table display-mode="compact" inner-borders="top" outer-borders="none">
+				<thead fd-table-header sticky="true">
+					<tr fd-table-row>
+						<th fd-table-header-cell>Name</th>
+						<th fd-table-header-cell></th>
+					</tr>
+				</thead>
+				<tbody fd-table-body>
+					<tr fd-table-row hoverable="true" ng-show="data.length == 0">
+						<td fd-table-cell no-data="true">No data available.</td>
+					</tr>
+					<tr fd-table-row hoverable="true" ng-repeat="next in data"
+						dg-selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
+						<td fd-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">{{next.Name}}</td>
+						<td fd-table-cell fit-content="true">
+							<fd-popover>
+								<fd-popover-control>
+									<fd-button compact="true" glyph="sap-icon--overflow" dg-type="transparent"
+										aria-label="Table Row Menu Button" ng-click="setTristate()">
+									</fd-button>
+								</fd-popover-control>
+								<fd-popover-body dg-align="bottom-right">
+									<fd-menu aria-label="Table Row Menu" no-backdrop="true" no-shadow="true">
+										<fd-menu-item ng-repeat="action in entityActions" title="{{action.label}}" ng-click="triggerEntityAction(action)"></fd-menu-item>
+										<fd-menu-item title="View Details" ng-click="openDetails(next)"></fd-menu-item>
+										<fd-menu-item title="Edit" ng-click="updateEntity(next)"></fd-menu-item>
+										<fd-menu-item title="Delete" ng-click="deleteEntity(next)"></fd-menu-item>
+									</fd-menu>
+								</fd-popover-body>
+							</fd-popover>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</fd-scrollbar>
+
+		<fd-pagination total-items="dataCount" items-per-page="dataLimit"
+			items-per-page-options="[10, 20, 50]" page-change="loadPage(pageNumber)"
+			items-per-page-change="loadPage(pageNumber)" items-per-page-placement="top-start" compact="true"
+			display-total-items="true" ng-hide="dataCount == 0">
+		</fd-pagination>
+	</body>
+
+</html>
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile-portal.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile-portal.extension
new file mode 100644
index 0000000..b997c12
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile-portal.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.js",
+    "extensionPoint": "portal-tile",
+    "description": "codbex-methods - Application Tile"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.extension
new file mode 100644
index 0000000..5fc0de8
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.js",
+    "extensionPoint": "codbex-methods-tile",
+    "description": "codbex-methods - Application Tile"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.js
similarity index 89%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.js
index 307b981..7ef1a42 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/tile.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/tile.js
@@ -12,8 +12,8 @@ exports.getTile = function () {
         type: "SETTING",
         report: "false",
         icon: "/services/web/resources/unicons/file.svg",
-        location: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/index.html",
+        location: "/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/index.html",
         order: "100",
-        groupOrder: "100",
+        groupOrder: "200"
     };
-};
+}
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.extension
new file mode 100644
index 0000000..65f4d27
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.js",
+    "extensionPoint": "codbex-methods-view",
+    "description": "codbex-methods - Application View"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.js
similarity index 68%
rename from codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.js
index 0591143..451ceba 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/view.js
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: "SentMethod",
     label: "SentMethod",
     factory: "frame",
-    region: "left",
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/SentMethod/index.html",
-    perspectiveName: "Methods",
+    region: "center",
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/SentMethod/index.html",
+    perspectiveName: "SentMethod"
 };
 
 if (typeof exports !== 'undefined') {
diff --git a/codbex-methods/gen/codbex-methods/ui/Methods/index.html b/codbex-methods/gen/codbex-methods/ui/SentMethod/index.html
similarity index 98%
rename from codbex-methods/gen/codbex-methods/ui/Methods/index.html
rename to codbex-methods/gen/codbex-methods/ui/SentMethod/index.html
index e18a5b0..250a39f 100644
--- a/codbex-methods/gen/codbex-methods/ui/Methods/index.html
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/index.html
@@ -65,7 +65,7 @@
                     };
                     Extensions.get('view', 'codbex-methods-view').then(function (response) {
                         $scope.layoutModel = {
-                            views: response.filter(e => !e.isLaunchpad && e.perspectiveName === 'Methods').map(e => e.id)
+                            views: response.filter(e => !e.isLaunchpad && e.perspectiveName === 'SentMethod').map(e => e.id)
                         };
                         $scope.state.isBusy = false;
                     }, function (error) {
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective-portal.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective-portal.extension
new file mode 100644
index 0000000..90c4367
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective-portal.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.js",
+    "extensionPoint": "portal",
+    "description": "codbex-methods - Perspective - SentMethod"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.extension b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.extension
new file mode 100644
index 0000000..e97aa46
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.extension
@@ -0,0 +1,5 @@
+{
+    "module": "codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.js",
+    "extensionPoint": "codbex-methods",
+    "description": "codbex-methods - Perspective - SentMethod"
+}
\ No newline at end of file
diff --git a/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.js b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.js
new file mode 100644
index 0000000..632d361
--- /dev/null
+++ b/codbex-methods/gen/codbex-methods/ui/SentMethod/perspective.js
@@ -0,0 +1,18 @@
+/*
+ * Generated by Eclipse Dirigible based on model and template.
+ *
+ * Do not modify the content as it may be re-generated again.
+ */
+const perspectiveData = {
+	id: 'SentMethod',
+	name: 'SentMethod',
+	link: '/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/index.html',
+	order: 200,
+	icon: '/services/web/resources/unicons/archive.svg',
+};
+
+if (typeof exports !== 'undefined') {
+	exports.getPerspective = function () {
+		return perspectiveData;
+	}
+}
\ No newline at end of file
diff --git a/codbex-methods/navigations/methods/navigation.extension b/codbex-methods/navigations/methods/navigation.extension
deleted file mode 100644
index 78dd251..0000000
--- a/codbex-methods/navigations/methods/navigation.extension
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "extensionPoint": "dashboard-navigations",
-    "module": "codbex-methods/navigations/methods/service.js",
-    "description": "Methods Navigation"
-}
\ No newline at end of file
diff --git a/codbex-methods/navigations/payment-method/navigation.extension b/codbex-methods/navigations/payment-method/navigation.extension
new file mode 100644
index 0000000..c54274c
--- /dev/null
+++ b/codbex-methods/navigations/payment-method/navigation.extension
@@ -0,0 +1,5 @@
+{
+    "extensionPoint": "dashboard-navigations",
+    "module": "codbex-methods/navigations/payment-method/service.js",
+    "description": "Payment Method Navigation"
+}
\ No newline at end of file
diff --git a/codbex-methods/navigations/methods/service.js b/codbex-methods/navigations/payment-method/service.js
similarity index 60%
rename from codbex-methods/navigations/methods/service.js
rename to codbex-methods/navigations/payment-method/service.js
index b269cb2..d654673 100644
--- a/codbex-methods/navigations/methods/service.js
+++ b/codbex-methods/navigations/payment-method/service.js
@@ -1,9 +1,9 @@
 const navigationData = {
-    id: 'methods-navigation',
+    id: 'payment-method-navigation',
     label: "Payment Methods",
     group: "reference data",
     order: 2400,
-    link: "/services/web/codbex-methods/gen/codbex-methods/ui/Methods/index.html?embedded"
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/PaymentMethod/index.html?embedded"
 };
 
 function getNavigation() {
@@ -14,4 +14,4 @@ if (typeof exports !== 'undefined') {
     exports.getNavigation = getNavigation;
 }
 
-export { getNavigation }
+export { getNavigation }
\ No newline at end of file
diff --git a/codbex-methods/navigations/sent-method/navigation.extension b/codbex-methods/navigations/sent-method/navigation.extension
new file mode 100644
index 0000000..9999333
--- /dev/null
+++ b/codbex-methods/navigations/sent-method/navigation.extension
@@ -0,0 +1,5 @@
+{
+    "extensionPoint": "dashboard-navigations",
+    "module": "codbex-methods/navigations/sent-method/service.js",
+    "description": "Sent Method Navigation"
+}
\ No newline at end of file
diff --git a/codbex-methods/navigations/sent-method/service.js b/codbex-methods/navigations/sent-method/service.js
new file mode 100644
index 0000000..c49463c
--- /dev/null
+++ b/codbex-methods/navigations/sent-method/service.js
@@ -0,0 +1,17 @@
+const navigationData = {
+    id: 'methods-navigation',
+    label: "Sent Methods",
+    group: "reference data",
+    order: 2600,
+    link: "/services/web/codbex-methods/gen/codbex-methods/ui/SentMethod/index.html?embedded"
+};
+
+function getNavigation() {
+    return navigationData;
+}
+
+if (typeof exports !== 'undefined') {
+    exports.getNavigation = getNavigation;
+}
+
+export { getNavigation }
\ No newline at end of file