diff --git a/database/factories/AgencyFactory.php b/database/factories/AgencyFactory.php
deleted file mode 100644
index 745846e..0000000
--- a/database/factories/AgencyFactory.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-use App\Entities\Agencies\Agency;
-use App\Entities\Users\User;
-use Faker\Generator as Faker;
-
-$factory->define(Agency::class, function (Faker $faker) {
-    return [
-        'name'     => $faker->company,
-        'email'    => $faker->safeEmail,
-        'owner_id' => function () {
-            return factory(User::class)->create()->id;
-        },
-    ];
-});
diff --git a/resources/lang/en/address.php b/resources/lang/en/address.php
new file mode 100644
index 0000000..608312e
--- /dev/null
+++ b/resources/lang/en/address.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'address'      => 'Address',
+    'contact'      => 'Contact',
+    'street'       => 'Steet',
+    'rt'           => 'RT',
+    'rw'           => 'RW',
+    'village'      => 'Village',
+    'district'     => 'District',
+    'municipality' => 'Municipality',
+    'city'         => 'City',
+    'province'     => 'Province',
+];
diff --git a/resources/lang/en/agency.php b/resources/lang/en/agency.php
new file mode 100644
index 0000000..bf75f59
--- /dev/null
+++ b/resources/lang/en/agency.php
@@ -0,0 +1,25 @@
+<?php
+
+return [
+    // Labels
+    'agency'    => 'Agency',
+    'not_found' => 'Agency not found',
+    'detail'    => 'Agency Detail',
+
+    // Actions
+    'edit'             => 'Edit Agency',
+    'update'           => 'Update Agency',
+    'updated'          => 'Agency data has been updated.',
+    'logo_change'      => 'Change Agency Logo',
+    'logo_upload'      => 'Upload Agency Logo',
+    'logo_upload_info' => 'Upload a <strong>.png</strong> file with <strong>200px width</strong>',
+
+    // Attributes
+    'name'    => 'Agency Name',
+    'tagline' => 'Agency Tagline',
+    'email'   => 'Agency Email',
+    'website' => 'Agency Website',
+    'address' => 'Agency Address',
+    'phone'   => 'Agency Phone',
+    'logo'    => 'Agency Logo',
+];
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
new file mode 100644
index 0000000..6ecbbb5
--- /dev/null
+++ b/resources/lang/en/app.php
@@ -0,0 +1,52 @@
+<?php
+
+return [
+    // Labels
+    'table_no'          => '#',
+    'no'                => 'No',
+    'label'             => 'Label',
+    'action'            => 'Action',
+    'welcome'           => 'Welcome',
+    'to'                => 'To',
+    'from'              => 'From',
+    'active'            => 'Active',
+    'in_active'         => 'In Aktif',
+    'show_detail_title' => 'Show :name :type detail',
+    'status'            => 'Status',
+    'type'              => 'Type',
+    'total'             => 'Total',
+    'count'             => 'Count',
+    'remark'            => 'Remark',
+
+    // Action
+    'add'                   => 'Add',
+    'submit'                => 'Submit',
+    'update'                => 'Update',
+    'delete'                => 'Delete',
+    'back'                  => 'Back',
+    'cancel'                => 'Cancel',
+    'reset'                 => 'Reset',
+    'show'                  => 'Show Detail',
+    'edit'                  => 'Edit',
+    'print'                 => 'Print',
+    'search'                => 'Search',
+    'filter'                => 'Filter',
+    'pick'                  => 'Pick',
+    'close'                 => 'Close',
+    'delete_confirm_button' => 'Yes, please delete!',
+    'delete_confirm'        => 'Are you sure to delete this?',
+    'change_photo'          => 'Change Photo',
+    'done'                  => 'Done',
+
+    // Attributes
+    'name'        => 'Name',
+    'notes'       => 'Notes',
+    'description' => 'Description',
+    'code'        => 'Code',
+    'date'        => 'Date',
+    'time'        => 'Time',
+    'created_at'  => 'Created At',
+    'created_by'  => 'Created By',
+    'start_date'  => 'Start Date',
+    'end_date'    => 'End Date',
+];
diff --git a/resources/lang/en/app_install.php b/resources/lang/en/app_install.php
new file mode 100644
index 0000000..69e5737
--- /dev/null
+++ b/resources/lang/en/app_install.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'header'           => 'Install <span class="text-primary">'.config('app.name').'</span>',
+    'agency_info_text' => 'Please fill form below to create your Agency.',
+    'admin_info_text'  => 'Please fill form below to create an Administrator Account.',
+    'admin_name'       => 'Administrator Name',
+    'admin_email'      => 'Administrator Email',
+    'button'           => 'Install Free PMO',
+];
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 6ef1a73..3f88490 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -1,19 +1,38 @@
 <?php
 
 return [
+    // Profile
+    'profile'         => 'My Profile',
+    'profile_edit'    => 'Edit My Profile',
+    'update_profile'  => 'Update Profile',
+    'profile_updated' => 'Profile has been updated.',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used during authentication for various
-    | messages that we need to display to the user. You are free to modify
-    | these language lines according to your application's requirements.
-    |
-    */
+    // Registration
+    'register'        => 'Create new Account',
+    'need_account'    => 'Need an Account?',
+    'have_an_account' => 'I have an Account',
 
-    'failed'   => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    // Login & Logout
+    'login'      => 'Login',
+    'welcome'    => 'Welcome :name.',
+    'failed'     => 'These credentials do not match our records.',
+    'throttle'   => 'Too many login attempts. Please try again in :seconds seconds.',
+    'logout'     => 'Logout',
+    'logged_out' => 'You have logged out.',
 
+    // Password
+    'change_password'          => 'Change Password',
+    'password_changed'         => 'Your password has been changed.',
+    'forgot_password'          => 'Forgot Password?',
+    'reset_password'           => 'Reset Password',
+    'send_reset_password_link' => 'Send reset password link',
+    'old_password_failed'      => 'Old password does not match!',
+
+    // Attributes
+    'email'                     => 'Email',
+    'password'                  => 'Password',
+    'password_confirmation'     => 'Confirm Password',
+    'old_password'              => 'Old Password',
+    'new_password'              => 'New Password',
+    'new_password_confirmation' => 'Confirm new Password',
 ];
diff --git a/resources/lang/en/bank_account.php b/resources/lang/en/bank_account.php
new file mode 100644
index 0000000..13a038f
--- /dev/null
+++ b/resources/lang/en/bank_account.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+    // Labels
+    'bank_account'  => 'Bank Account',
+    'list'          => 'Bank Account list',
+    'empty'         => 'Bank Account list is empty',
+    'back_to_index' => 'Back to Bank Account list',
+
+    // Actions
+    'create'         => 'Create new Bank Account',
+    'created'        => 'New Bank Account has been created.',
+    'show'           => 'Show Bank Account detail',
+    'edit'           => 'Edit Bank Account',
+    'update'         => 'Update Bank Account',
+    'updated'        => 'Bank Account data has been updated.',
+    'delete'         => 'Delete Bank Account',
+    'delete_confirm' => 'Are you sure to delete this Bank Account data?',
+    'deleted'        => 'Bank Account data has been deleted.',
+    'undeleted'      => 'Bank Account Data not deleted.',
+    'undeleteable'   => 'Bank Account Data can not be deleted.',
+
+    // Attributes
+    'name'         => 'Bank Name',
+    'number'       => 'Account Number',
+    'account_name' => 'Account Name',
+    'description'  => 'Description',
+];
diff --git a/resources/lang/en/contact.php b/resources/lang/en/contact.php
new file mode 100644
index 0000000..523a056
--- /dev/null
+++ b/resources/lang/en/contact.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'contact'   => 'Contact',
+    'phone'     => 'Phone',
+    'phone_abb' => 'Phone',
+    'cellphone' => 'Cell phone',
+    'email'     => 'Email',
+    'website'   => 'Website',
+];
diff --git a/resources/lang/en/customer.php b/resources/lang/en/customer.php
new file mode 100644
index 0000000..3b6258f
--- /dev/null
+++ b/resources/lang/en/customer.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+    // Labels
+    'master'        => 'Customer',
+    'list'          => 'Customer List',
+    'search'        => 'Search Customer',
+    'detail'        => 'Customer Detail',
+    'not_found'     => 'Customer not found.',
+    'empty'         => 'Customer is empty.',
+    'back_to_show'  => 'Back to Customer Detail',
+    'back_to_index' => 'Back to Customer List',
+
+    // Actions
+    'create'         => 'Create new Customer',
+    'created'        => 'Create new Customer succeded.',
+    'show'           => 'View Customer Detail',
+    'edit'           => 'Edit Customer',
+    'update'         => 'Update Customer',
+    'updated'        => 'Update Customer succeded.',
+    'delete'         => 'Delete Customer',
+    'delete_confirm' => 'Are you sure to delete this Customer?',
+    'deleted'        => 'Delete Customer succeded.',
+    'undeleted'      => 'Customer not deleted.',
+    'undeleteable'   => 'Customer data cannot be deleted.',
+
+    // Attributes
+    'name'           => 'Customer Name',
+    'description'    => 'Customer Description',
+    'pic'            => 'PIC',
+    'projects_count' => 'Projects count',
+];
diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php
new file mode 100644
index 0000000..b4035b6
--- /dev/null
+++ b/resources/lang/en/dashboard.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'project_status_stats'             => 'Project Status Stat',
+    'earnings_stats'                   => 'Earning Stat',
+    'upcoming_subscriptions_expiry'    => 'Upcoming Subscription Expiry',
+    'no_upcoming_subscriptions_expiry' => 'No upcoming expiry within next 60 days.',
+    'yearly_earnings'                  => 'Yearly Earnings',
+    'finished_projects_count'          => 'Finished projects',
+    'receiveable_earnings'             => 'Receiveable Earnings',
+];
diff --git a/resources/lang/en/file.php b/resources/lang/en/file.php
new file mode 100644
index 0000000..6fd0ee2
--- /dev/null
+++ b/resources/lang/en/file.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+    // Labels
+    'file'          => 'File',
+    'list'          => 'File List',
+    'search'        => 'Search File',
+    'not_found'     => 'File not found.',
+    'empty'         => 'File list is empty.',
+    'back_to_index' => 'Back to File List',
+
+    // Actions
+    'create'         => 'Upload new File',
+    'created'        => 'New File has been created.',
+    'edit'           => 'Edit File',
+    'update'         => 'Update File',
+    'updated'        => 'New File has been updated.',
+    'delete'         => 'Delete File',
+    'delete_confirm' => 'Are you sure to delete this File?',
+    'deleted'        => 'File has been deleted.',
+    'undeleted'      => 'File not deleted.',
+    'undeleteable'   => 'File can not be deleted.',
+    'select'         => 'Select File',
+    'upload'         => 'Upload File',
+    'download'       => 'Download',
+
+    // Attributes
+    'title'       => 'File Name',
+    'description' => 'File Description',
+    'size'        => 'File Size',
+    'updated_at'  => 'Udpated at',
+];
diff --git a/resources/lang/en/invoice.php b/resources/lang/en/invoice.php
new file mode 100644
index 0000000..4400839
--- /dev/null
+++ b/resources/lang/en/invoice.php
@@ -0,0 +1,54 @@
+<?php
+
+return [
+    // Labels
+    'invoice'          => 'Invoice',
+    'list'             => 'Invoice List',
+    'search'           => 'Search Invoice',
+    'detail'           => 'Invoice Detail',
+    'not_found'        => 'Invoice not found.',
+    'empty'            => 'Invoice list is empty.',
+    'back_to_show'     => 'Back to Invoice Detail',
+    'back_to_index'    => 'Back to Invoice List',
+    'back_to_project'  => 'Back to Project Invoices',
+    'draft_list'       => 'Draft Invoice List',
+    'draft_list_empty' => 'Draft Invoice is empty.',
+    'draft_not_found'  => 'Draft Invoice not found.',
+
+    // Actions
+    'proccess'            => 'Proccess Invoice',
+    'item_list_empty'     => 'Item List is empty.',
+    'create'              => 'Create new Invoice',
+    'save'                => 'Save Invoice',
+    'created'             => 'New Invoice has been created.',
+    'show'                => 'Invoice Detail',
+    'edit'                => 'Edit Invoice',
+    'update'              => 'Update Invoice',
+    'updated'             => 'Invoice data has been updated.',
+    'delete'              => 'Delete Invoice',
+    'delete_confirm'      => 'Are you sure to delete this Invoice?',
+    'deleted'             => 'Invoice data has been deleted.',
+    'undeleted'           => 'Invoice not deleted.',
+    'undeleteable'        => 'Invoice can not be deleted.',
+    'print'               => 'Print Invoice',
+    'add_item'            => 'Add Item',
+    'item_added'          => 'Item added.',
+    'item_updated'        => 'Item updated.',
+    'item_removed'        => 'Item deleted.',
+    'confirm_instruction' => 'Please check this Invoice detail, hit :back_link to edit the detail.',
+
+    // Attributes
+    'number'           => 'Invocie No.',
+    'project'          => 'Project',
+    'creator'          => 'Creator',
+    'items'            => 'Invoice Item',
+    'notes'            => 'Notes',
+    'date'             => 'Date',
+    'due_date'         => 'Due Date',
+    'amount'           => 'Amount',
+    'total'            => 'Invoice Total',
+    'customer'         => 'Customer',
+    'item_description' => 'Description',
+    'item_amount'      => 'Amount',
+    'items_count'      => 'Item Count',
+];
diff --git a/resources/lang/en/job.php b/resources/lang/en/job.php
new file mode 100644
index 0000000..3871d37
--- /dev/null
+++ b/resources/lang/en/job.php
@@ -0,0 +1,38 @@
+<?php
+
+return [
+    // Labels
+    'job'           => 'Job',
+    'list'          => 'Job List',
+    'additional'    => 'Additional Job List',
+    'on_progress'   => 'Job on Progress',
+    'search'        => 'Ssearch Job',
+    'found'         => 'Job found.',
+    'not_found'     => 'Job not found.',
+    'tasks'         => 'Task List',
+    'price_total'   => 'Job Price Total',
+    'tasks_count'   => 'Tasks Count',
+    'empty'         => 'Job list is empty.',
+    'back_to_index' => 'Back to Job List',
+
+    // Actions
+    'create'                 => 'Create new Job',
+    'created'                => 'New Job has been created.',
+    'show'                   => 'Job Detail',
+    'edit'                   => 'Edit Job',
+    'update'                 => 'Update Job',
+    'updated'                => 'Job data has been updated.',
+    'delete'                 => 'Delete Job',
+    'deleted'                => 'Job has been deleted.',
+    'undeleted'              => 'Job not deleted.',
+    'add_from_other_project' => 'Add Job from another Project',
+    'sort_tasks'             => 'Sort Task Priority',
+
+    // Attributes
+    'name'        => 'Job Name',
+    'description' => 'Deskripsi',
+    'progress'    => 'Progress',
+    'worker'      => 'Worker',
+    'price'       => 'Price',
+    'type'        => 'Job Type',
+];
diff --git a/resources/lang/en/nav_menu.php b/resources/lang/en/nav_menu.php
new file mode 100644
index 0000000..87d980f
--- /dev/null
+++ b/resources/lang/en/nav_menu.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'dashboard' => 'Dashboard',
+    'agency'    => 'Agency Profile',
+];
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index ffa19ba..e73b56d 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -14,9 +14,9 @@ return [
     */
 
     'password' => 'Passwords must be at least six characters and match the confirmation.',
-    'reset'    => 'Your password has been reset!',
-    'sent'     => 'We have e-mailed your password reset link!',
-    'token'    => 'This password reset token is invalid.',
     'user'     => "We can't find a user with that e-mail address.",
+    'token'    => 'This password reset token is invalid.',
+    'sent'     => 'We have e-mailed your password reset link!',
+    'reset'    => 'Your password has been reset!',
 
 ];
diff --git a/resources/lang/en/payment.php b/resources/lang/en/payment.php
new file mode 100644
index 0000000..4dac411
--- /dev/null
+++ b/resources/lang/en/payment.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    // Labels
+    'payment'       => 'Payment',
+    'payments'      => 'Payment List',
+    'list'          => 'Payment List',
+    'found'         => 'Payment found.',
+    'not_found'     => 'Payment not found.',
+    'empty'         => 'Payment list is empty.',
+    'back_to_index' => 'Back to Payment List',
+    'receipt'       => 'Payment Receipt',
+    'from'          => 'Receive from',
+    'cash_amount'   => 'Cash amount',
+    'words_amount'  => 'In word amount',
+
+    // Actions
+    'create'     => 'Create new Payment',
+    'create_fee' => 'Create Fee Payment',
+    'created'    => 'Payment has been created.',
+    'show'       => 'Show Payment Detail',
+    'detail'     => 'Payment Detail',
+    'edit'       => 'Edit Payment',
+    'update'     => 'Update Payment',
+    'updated'    => 'Payment data has been updated.',
+    'delete'     => 'Delete Payment',
+    'deleted'    => 'Payment has been deleted.',
+    'undeleted'  => 'Payment not deleted.',
+    'search'     => 'Search Project Payment',
+    'print'      => 'Print Receipt',
+
+    // Attrubutes
+    'id'          => 'Payment ID',
+    'description' => 'description',
+    'date'        => 'Payment Date',
+    'in_out'      => 'Transaction Type',
+    'type'        => 'Payment Type',
+    'project'     => 'Project',
+    'customer'    => 'Customer',
+    'amount'      => 'Amount',
+    'cash_in'     => 'Cash In',
+    'cash_out'    => 'Cash Out',
+    'payer'       => 'Payer',
+
+    // Types
+    'types' => [
+        'project'     => 'Project',
+        'add_job'     => 'Add Job',
+        'maintenance' => 'Maintenance',
+    ],
+];
diff --git a/resources/lang/en/subscription.php b/resources/lang/en/subscription.php
new file mode 100644
index 0000000..cfc2cc3
--- /dev/null
+++ b/resources/lang/en/subscription.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+
+    // Labels
+    'subscription'  => 'Subscription',
+    'subscriptions' => 'Subscription List',
+    'list'          => 'Subscription List',
+    'detail'        => 'Subscription Detail',
+    'search'        => 'Search Subscription',
+    'found'         => 'Subscription found.',
+    'not_found'     => 'Subscription not found.',
+    'empty'         => 'Subscription list is empty.',
+    'back_to_show'  => 'Back to Subscription Detail',
+    'back_to_index' => 'Back to Subscription List',
+
+    // Actions
+    'create'    => 'Create new Subscription',
+    'created'   => 'Subscription has been created.',
+    'show'      => 'Show Subscription Detail',
+    'edit'      => 'Edit Subscription',
+    'update'    => 'Update Subscription',
+    'updated'   => 'Subscription data has been updated.',
+    'delete'    => 'Delete Subscription',
+    'deleted'   => 'Subscription has been deleted.',
+    'undeleted' => 'Subscription not deleted.',
+
+    // Attributes
+    'name'             => 'Subscription Name',
+    'price'            => 'Price',
+    'domain_name'      => 'Domain',
+    'domain_price'     => 'Domain Price',
+    'epp_code'         => 'EPP Code',
+    'hosting_capacity' => 'Hosting Capacity',
+    'hosting_price'    => 'Hosting Price',
+    'start_date'       => 'Start Date',
+    'due_date'         => 'Due Date',
+    'extension_price'  => 'Extension Price',
+    'project'          => 'Project',
+    'customer'         => 'Customer',
+    'vendor'           => 'Vendor',
+    'notes'            => 'Notes',
+    'type'             => 'Subscription Type',
+
+    // Types
+    'types' => [
+        'domain'      => 'Domain',
+        'hosting'     => 'Hosting',
+        'maintenance' => 'Maintenance',
+    ],
+];
diff --git a/resources/lang/en/task.php b/resources/lang/en/task.php
new file mode 100644
index 0000000..b1f1697
--- /dev/null
+++ b/resources/lang/en/task.php
@@ -0,0 +1,29 @@
+<?php
+
+return [
+    // Labels
+    'task'              => 'Task',
+    'list'              => 'Task List',
+    'empty'             => 'Task List is empty.',
+    'search'            => 'Search Task',
+    'found'             => 'Task found.',
+    'not_found'         => 'Task not found.',
+    'back_to_index'     => 'Back to Task List',
+    'move_to_other_job' => 'Move to other Job',
+
+    // Actions
+    'create'    => 'Create new Task',
+    'created'   => 'Task has been created.',
+    'show'      => 'Task Detail',
+    'edit'      => 'Edit Task',
+    'update'    => 'Update Task',
+    'updated'   => 'Task has been updated.',
+    'delete'    => 'Delete Task',
+    'deleted'   => 'Task has been deleted.',
+    'undeleted' => 'Task not deleted.',
+
+    // Attributes
+    'name'        => 'Task Name',
+    'progress'    => 'Progress',
+    'description' => 'Task Description',
+];
diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php
new file mode 100644
index 0000000..e195672
--- /dev/null
+++ b/resources/lang/en/user.php
@@ -0,0 +1,40 @@
+<?php
+
+return [
+    // Label
+    'user'          => 'User',
+    'list'          => 'User List',
+    'user_id'       => 'User ID',
+    'profile'       => 'User Profile',
+    'search'        => 'Search User: ketik nama',
+    'search'        => 'Type user name then hit Enter..',
+    'found'         => 'User found.',
+    'not_found'     => 'User not found.',
+    'empty'         => 'User list is empty.',
+    'back_to_index' => 'Back to User List',
+
+    // Actions
+    'create'    => 'Create new User',
+    'created'   => 'User has been created.',
+    'show'      => 'User Detail',
+    'edit'      => 'Edit User Data',
+    'update'    => 'Update User Data',
+    'updated'   => 'User has been updated.',
+    'delete'    => 'Delete User Data',
+    'deleted'   => 'User has been deleted.',
+    'undeleted' => 'User not deleted.',
+
+    // Attributes
+    'name'          => 'User Name',
+    'email'         => 'Email',
+    'api_token'     => 'API Token',
+    'registered_at' => 'Registered at',
+
+    // Roles
+
+    'role'  => 'Role',
+    'roles' => [
+        'admin'  => 'Administrator',
+        'worker' => 'Worker',
+    ],
+];
diff --git a/resources/lang/en/vendor.php b/resources/lang/en/vendor.php
new file mode 100644
index 0000000..4126647
--- /dev/null
+++ b/resources/lang/en/vendor.php
@@ -0,0 +1,29 @@
+<?php
+
+return [
+    // Labels
+    'vendor'        => 'Vendor',
+    'list'          => 'Vendor List',
+    'search'        => 'Search Vendor',
+    'not_found'     => 'Vendor not found.',
+    'empty'         => 'Vendor list is empty.',
+    'back_to_show'  => 'Back to Vendor Detail',
+    'back_to_index' => 'Back to Vendor List',
+
+    // Actions
+    'create'         => 'Create new Vendor',
+    'created'        => 'Vendor has been created.',
+    'show'           => 'Vendor Detail',
+    'edit'           => 'Edit Vendor',
+    'update'         => 'Update Vendor',
+    'updated'        => 'Vendor has been updated.',
+    'delete'         => 'Delete Vendor',
+    'delete_confirm' => 'Are you sure to delete this Vendor?',
+    'deleted'        => 'Vendor has been deleted.',
+    'undeleted'      => 'Vendor not deleted.',
+    'undeleteable'   => 'Vendor can not be deleted.',
+
+    // Attributes
+    'name'        => 'Vendor Name',
+    'description' => 'Vendor Description',
+];
diff --git a/resources/lang/id/permission.php b/resources/lang/id/permission.php
deleted file mode 100644
index cbbc740..0000000
--- a/resources/lang/id/permission.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-return [
-    'permission'    => 'Hak Akses',
-    'permissions'   => 'Daftar Hak Akses',
-    'name'          => 'Nama Hak Akses',
-    'create'        => 'Input Hak Akses Baru',
-    'created'       => 'Input Hak Akses baru telah berhasil.',
-    'show'          => 'Detail Hak Akses',
-    'edit'          => 'Edit Hak Akses',
-    'update'        => 'Update Hak Akses',
-    'updated'       => 'Update data Hak Akses telah berhasil.',
-    'delete'        => 'Hapus Hak Akses',
-    'deleted'       => 'Hapus data Hak Akses telah berhasil.',
-    'undeleted'     => 'Data Hak Akses gagal dihapus.',
-    'search'        => 'Cari Hak Akses',
-    'found'         => 'Hak Akses ditemukan',
-    'not_found'     => 'Hak Akses tidak ditemukan',
-    'roles_count'   => 'Jumlah Grup',
-    'empty'         => 'Belum ada Hak Akses',
-    'back_to_index' => 'Kembali ke daftar Hak Akses',
-];
diff --git a/resources/lang/id/role.php b/resources/lang/id/role.php
deleted file mode 100644
index 2f19cb2..0000000
--- a/resources/lang/id/role.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-return [
-    'role'          => 'Grup',
-    'roles'         => 'Daftar Grup',
-    'name'          => 'Nama Grup',
-    'create'        => 'Input Grup Baru',
-    'created'       => 'Input Grup baru telah berhasil.',
-    'show'          => 'Detail Grup',
-    'edit'          => 'Edit Grup',
-    'update'        => 'Update Grup',
-    'updated'       => 'Update data Grup telah berhasil.',
-    'delete'        => 'Hapus Grup',
-    'deleted'       => 'Hapus data Grup telah berhasil.',
-    'undeleted'     => 'Data Grup gagal dihapus.',
-    'search'        => 'Cari Grup',
-    'found'         => 'Grup ditemukan',
-    'not_found'     => 'Grup tidak ditemukan',
-    'users_count'   => 'Jumlah User',
-    'empty'         => 'Belum ada Grup',
-    'back_to_index' => 'Kembali ke daftar Grup',
-];
diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php
index d98dfe2..1ab6846 100644
--- a/tests/Unit/Models/SubscriptionTest.php
+++ b/tests/Unit/Models/SubscriptionTest.php
@@ -30,7 +30,7 @@ class SubscriptionTest extends TestCase
     /** @test */
     public function it_has_near_of_due_date_method()
     {
-        $next3Months = Carbon::now()->addMonths(2)->format('Y-m-d');
+        $next3Months = Carbon::now()->addMonths(3)->format('Y-m-d');
         $subscription = factory(Subscription::class)->make(['due_date' => $next3Months]);
 
         $this->assertFalse($subscription->nearOfDueDate());
@@ -45,7 +45,7 @@ class SubscriptionTest extends TestCase
     public function it_has_near_of_due_date_sign_method()
     {
         // Due date within next 3 months
-        $next3Months = Carbon::now()->addMonths(2)->format('Y-m-d');
+        $next3Months = Carbon::now()->addMonths(3)->format('Y-m-d');
         $subscription = factory(Subscription::class)->make(['due_date' => $next3Months]);
 
         $this->assertEquals('', $subscription->nearOfDueDateSign());