diff --git a/.gitignore b/.gitignore
index c9ad216f..e2ff2f6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,8 @@ pages/
 system/cache/**
 system/plugin/**
 !system/cache/index.html
-!system/plugin/index.html
\ No newline at end of file
+!system/plugin/index.html
+system/paymentgateway/ui/**
+system/paymentgateway/**
+!system/paymentgateway/ui/index.html
+!system/paymentgateway/index.html
\ No newline at end of file
diff --git a/system/paymentgateway/channel_midtrans.json b/system/paymentgateway/channel_midtrans.json
deleted file mode 100644
index 53600d01..00000000
--- a/system/paymentgateway/channel_midtrans.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-	{
-		"id": "credit_card",
-		"name": "Credit Card"
-	},
-	{
-		"id": "bca_va",
-		"name": "BCA"
-	},
-	{
-		"id": "permata_va",
-		"name": "Permata"
-	},
-	{
-		"id": "bni_va",
-		"name": "BNI"
-	},
-	{
-		"id": "bri_va",
-		"name": "BRI"
-	},
-	{
-		"id": "echannel",
-		"name": "Mandiri Bill"
-	},
-	{
-		"id": "gopay",
-		"name": "Gopay"
-	},
-	{
-		"id": "bca_klikbca",
-		"name": "KLIKBCA"
-	},
-	{
-		"id": "bca_klikpay",
-		"name": "BCA KLIKPAY"
-	},
-	{
-		"id": "cimb_clicks",
-		"name": "CIMB Clicks"
-	},
-	{
-		"id": "danamon_online",
-		"name": "Danamon"
-	},
-	{
-		"id": "bri_epay",
-		"name": "BRImo"
-	},
-	{
-		"id": "indomaret",
-		"name": "Indomaret"
-	},
-	{
-		"id": "alfamart",
-		"name": "Alfamart"
-	},
-	{
-		"id": "ShopeePay",
-		"name": "ShopeePay"
-	},
-	{
-		"id": "uob_ezpay",
-		"name": "UOB EZ Pay"
-	}
-]
diff --git a/system/paymentgateway/index.html b/system/paymentgateway/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/ui/ui/duitku_channel.tpl b/ui/ui/duitku_channel.tpl
deleted file mode 100644
index 96038896..00000000
--- a/ui/ui/duitku_channel.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{include file="sections/user-header.tpl"}
-<div class="row">
-    <div class="col-sm-12">
-            <div class="panel panel-info panel-hovered">
-            <div class="panel-heading">Duitku {Lang::T('Payment Channel')}</div>
-            <div class="panel-body row">
-                {foreach $channels as $channel}
-                    {if in_array($channel['id'], $duitku_channels)}
-                        <div class="col-sm-4 mb20">
-                            <a href="{$_url}order/buy/{$path}/{$channel['id']}"
-                            onclick="return confirm('{$channel['name']}')"
-                            class="btn btn-block btn-default">{$channel['name']}</a>
-                        </div>
-                    {/if}
-                {/foreach}
-            </div>
-    </div>
-</div>
-{include file="sections/user-footer.tpl"}
diff --git a/ui/ui/pg-duitku.tpl b/ui/ui/pg-duitku.tpl
deleted file mode 100644
index 682e8f58..00000000
--- a/ui/ui/pg-duitku.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{include file="sections/header.tpl"}
-
-<form class="form-horizontal" method="post" role="form" action="{$_url}paymentgateway/duitku" >
-    <div class="row">
-        <div class="col-sm-12 col-md-12">
-            <div class="panel panel-default panel-hovered panel-stacked mb30">
-                <div class="panel-heading">DUITKU</div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Kode Merchant</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="duitku_merchant_id" name="duitku_merchant_id" placeholder="D" value="{$_c['duitku_merchant_id']}">
-                            <a href="https://duitku.com/merchant/Project" target="_blank" class="help-block">https://duitku.com/merchant/Project</a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Merchant/API Key</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="duitku_merchant_key" name="duitku_merchant_key" placeholder="xxxxxxxxxxxxxxxxx" value="{$_c['duitku_merchant_key']}">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Url Callback Proyek</label>
-                        <div class="col-md-6">
-                            <input type="text" readonly class="form-control" onclick="this.select()" value="{$_url}callback/duitku">
-                            <a href="https://duitku.com/merchant/Project" target="_blank" class="help-block">https://duitku.com/merchant/Project</a>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Channels</label>
-                        <div class="col-md-6">
-                            {foreach $channels as $channel}
-                                <label class="checkbox-inline"><input type="checkbox" {if strpos($_c['duitku_channel'], $channel['id']) !== false}checked="true"{/if} id="duitku_channel" name="duitku_channel[]" value="{$channel['id']}"> {$channel['name']}</label>
-                            {/foreach}
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-lg-offset-2 col-lg-10">
-                            <button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
-                        </div>
-                    </div>
-                        <pre>/ip hotspot walled-garden
-add dst-host=duitku.com
-add dst-host=*.duitku.com</pre>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</form>
-{include file="sections/footer.tpl"}
diff --git a/ui/ui/pg-tripay.tpl b/ui/ui/pg-tripay.tpl
deleted file mode 100644
index 6c22eefa..00000000
--- a/ui/ui/pg-tripay.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{include file="sections/header.tpl"}
-
-<form class="form-horizontal" method="post" role="form" action="{$_url}paymentgateway/tripay" >
-    <div class="row">
-        <div class="col-sm-12 col-md-12">
-            <div class="panel panel-default panel-hovered panel-stacked mb30">
-                <div class="panel-heading">Tripay</div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Kode Merchant</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="tripay_merchant" name="tripay_merchant" placeholder="T" value="{$_c['tripay_merchant']}">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">API Key</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="tripay_api_key" name="tripay_api_key" value="{$_c['tripay_api_key']}">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Secret Key</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="tripay_secret_key" name="tripay_secret_key" value="{$_c['tripay_secret_key']}">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Notification URL</label>
-                        <div class="col-md-6">
-                            <input type="text" readonly class="form-control" onclick="this.select()" value="{$_url}callback/tripay">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Channels</label>
-                        <div class="col-md-6">
-                            {foreach $channels as $channel}
-                                <label class="checkbox-inline"><input type="checkbox" {if strpos($_c['tripay_channel'], $channel['id']) !== false}checked="true"{/if} id="tripay_channel" name="tripay_channel[]" value="{$channel['id']}"> {$channel['name']}</label>
-                            {/foreach}
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-lg-offset-2 col-lg-10">
-                            <button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
-                            <a class="btn btn-info waves-effect waves-light" href="https://tripay.co.id/?ref=TP19304" target="_blank">Daftar Tripay</a>
-                        </div>
-                    </div>
-                        <pre>/ip hotspot walled-garden
-add dst-host=tripay.co.id
-add dst-host=*.tripay.co.id</pre>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</form>
-{include file="sections/footer.tpl"}
diff --git a/ui/ui/pg-xendit.tpl b/ui/ui/pg-xendit.tpl
deleted file mode 100644
index 0f7f5bc9..00000000
--- a/ui/ui/pg-xendit.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{include file="sections/header.tpl"}
-
-<form class="form-horizontal" method="post" role="form" action="{$_url}paymentgateway/xendit" >
-    <div class="row">
-        <div class="col-sm-12 col-md-12">
-            <div class="panel panel-default panel-hovered panel-stacked mb30">
-                <div class="panel-heading">XENDIT</div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Secret Key</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="xendit_secret_key" name="xendit_secret_key" placeholder="xnd_" value="{$_c['xendit_secret_key']}">
-                            <a href="https://dashboard.xendit.co/settings/developers#api-keys" target="_blank" class="help-block">https://dashboard.xendit.co/settings/developers#api-keys</a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Verification Token</label>
-                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="xendit_verification_token" name="xendit_verification_token" placeholder="cece1878a4a24754fb193309d3977f4dc0e86e907c4fb188cbccd10d8ef67fd3" value="{$_c['xendit_verification_token']}">
-                            <a href="https://dashboard.xendit.co/settings/developers#callbacks" target="_blank" class="help-block">https://dashboard.xendit.co/settings/developers#callbacks</a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Callback URL</label>
-                        <div class="col-md-6">
-                            <input type="text" readonly class="form-control" onclick="this.select()" value="{$_url}callback/xendit">
-                            <a href="https://dashboard.xendit.co/settings/developers#callbacks" target="_blank" class="help-block">https://dashboard.xendit.co/settings/developers#callbacks</a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">Channels</label>
-                        <div class="col-md-6">
-                            {foreach $channels as $channel}
-                                <label class="checkbox-inline"><input type="checkbox" {if strpos($_c['xendit_channel'], $channel['id']) !== false}checked="true"{/if} id="xendit_channel" name="xendit_channel[]" value="{$channel['id']}"> {$channel['name']}</label>
-                            {/foreach}
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-lg-offset-2 col-lg-10">
-                            <button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
-                        </div>
-                    </div>
-                        <pre>/ip hotspot walled-garden
-add dst-host=xendit.co
-add dst-host=*.xendit.co</pre>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</form>
-{include file="sections/footer.tpl"}
diff --git a/ui/ui/tripay_channel.tpl b/ui/ui/tripay_channel.tpl
deleted file mode 100644
index 8ef809ff..00000000
--- a/ui/ui/tripay_channel.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{include file="sections/user-header.tpl"}
-<div class="row">
-    <div class="col-sm-12">
-            <div class="panel panel-info panel-hovered">
-            <div class="panel-heading">Tripay {Lang::T('Payment Channel')}</div>
-            <div class="panel-body row">
-                {foreach $channels as $channel}
-                    {if in_array($channel['id'], $tripay_channels)}
-                        <div class="col-sm-4 mb20">
-                            <a href="{$_url}order/buy/{$path}/{$channel['id']}"
-                            onclick="return confirm('{$channel['name']}')"
-                            class="btn btn-block btn-default">{$channel['name']}</a>
-                        </div>
-                    {/if}
-                {/foreach}
-            </div>
-    </div>
-</div>
-{include file="sections/user-footer.tpl"}