all: rename folders and files (fixes #1654) (#1653)

Co-authored-by: dogi <[email protected]>
treehouses · Oct 22, 2020 · c065711 · c065711
1 parent 5d8cd9e
commit c065711
Show file tree

Hide file tree

Showing 116 changed files with 283 additions and 346 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,2 +1,2 @@
 exclude_patterns:
-  - "app/src/main/kotlin/io/treehouses/remote/Views/terminal"
+  - "app/src/main/kotlin/io/treehouses/remote/views/terminal"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -143,7 +143,7 @@
 -keep interface com.github.nkzawa.** { *; }
 
 -keep class io.treehouses.remote.pojo.** { *; }
--keep class io.treehouses.remote.SSH.beans.** { *; }
+-keep class io.treehouses.remote.ssh.beans.** { *; }
 
 -keep public class com.trilead.ssh2.compression.**
 -keep public class com.trilead.ssh2.crypto.**

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -43,12 +43,12 @@
         </activity>
 
         <service
-            android:name="io.treehouses.remote.SSH.Terminal.TerminalManager"
+            android:name="io.treehouses.remote.ssh.terminal.TerminalManager"
             android:configChanges="keyboardHidden|orientation"
             />
 
         <activity
-            android:name=".SSHConsole.SSHConsole"
+            android:name=".sshconsole.SSHConsole"
             android:configChanges="keyboardHidden|orientation"
             android:launchMode="singleTop"
             android:theme="@style/Theme.AppCompat"
@@ -66,7 +66,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <service
-            android:name=".Network.BluetoothChatService"
+            android:name=".network.BluetoothChatService"
             android:label="Bluetooth Connection"
             android:enabled="true">
         </service>

diff --git a/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt b/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt
@@ -11,8 +11,8 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.core.view.GravityCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.navigation.NavigationView
-import io.treehouses.remote.Fragments.*
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.fragments.*
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.bases.PermissionActivity
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.callback.NotificationCallback
@@ -121,7 +121,7 @@ open class BaseInitialActivity: PermissionActivity(), NavigationView.OnNavigatio
             when (id) {
                 R.id.menu_about -> openCallFragment(AboutFragment())
                 R.id.menu_home -> openCallFragment(HomeFragment())
-                R.id.menu_ssh -> openCallFragment(SSHConfig())
+                R.id.menu_ssh -> openCallFragment(SSHConfigFragment())
             }
         }
         title = item.title; currentTitle = item.title.toString()
@@ -139,7 +139,7 @@ open class BaseInitialActivity: PermissionActivity(), NavigationView.OnNavigatio
             R.id.menu_about -> AboutFragment()
             R.id.menu_status -> StatusFragment()
             R.id.menu_tunnel2 -> SSHTunnelFragment()
-            R.id.menu_ssh -> SSHConfig()
+            R.id.menu_ssh -> SSHConfigFragment()
             else -> HomeFragment()
         }
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt b/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt
@@ -16,10 +16,10 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.preference.PreferenceManager
-import io.treehouses.remote.Fragments.CommunityFragment
-import io.treehouses.remote.Fragments.DialogFragments.FeedbackDialogFragment
-import io.treehouses.remote.Fragments.DiscoverFragment
-import io.treehouses.remote.Fragments.SettingsFragment
+import io.treehouses.remote.fragments.CommunityFragment
+import io.treehouses.remote.fragments.dialogfragments.FeedbackDialogFragment
+import io.treehouses.remote.fragments.DiscoverFragment
+import io.treehouses.remote.fragments.SettingsFragment
 import io.treehouses.remote.callback.BackPressReceiver
 import io.treehouses.remote.databinding.ActivityInitial2Binding
 import io.treehouses.remote.ui.home.HomeFragment

diff --git a/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt b/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt
@@ -9,12 +9,10 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Build
 import android.os.IBinder
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.preference.PreferenceManager
 import com.parse.Parse
-import io.treehouses.remote.Network.BluetoothChatService
-import io.treehouses.remote.utils.LogUtils
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.utils.SaveUtils
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt
@@ -4,7 +4,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
-import io.treehouses.remote.Views.HelpViewHolder
+import io.treehouses.remote.views.HelpViewHolder
 import io.treehouses.remote.databinding.RowHelpBinding
 import io.treehouses.remote.pojo.HelpCommand
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
 import android.widget.TextView
 import androidx.annotation.RequiresApi
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.pojo.NetworkListItem

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt
@@ -3,12 +3,9 @@ package io.treehouses.remote.adapter
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
 import androidx.fragment.app.FragmentStatePagerAdapter
-import androidx.fragment.app.FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
 import androidx.viewpager.widget.PagerAdapter
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import io.treehouses.remote.Fragments.ServiceCardFragment
+import io.treehouses.remote.fragments.ServiceCardFragment
 import io.treehouses.remote.pojo.ServiceInfo
 import java.util.*
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt
@@ -6,10 +6,10 @@ import android.view.ViewGroup
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.viewpager.widget.PagerAdapter
-import io.treehouses.remote.SSHConsole.BaseSSHConsole
+import io.treehouses.remote.sshconsole.BaseSSHConsole
 import io.treehouses.remote.R
-import io.treehouses.remote.SSH.Terminal.TerminalBridge
-import io.treehouses.remote.SSH.Terminal.TerminalView
+import io.treehouses.remote.ssh.terminal.TerminalBridge
+import io.treehouses.remote.ssh.terminal.TerminalView
 import io.treehouses.remote.callback.TerminalPager
 
 class TerminalPagerAdapter : PagerAdapter() {

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt
@@ -4,9 +4,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.viewpager.widget.PagerAdapter
-import io.treehouses.remote.Fragments.SocksFragment
-import io.treehouses.remote.Fragments.TorTabFragment
-import io.treehouses.remote.Fragments.TunnelSSHFragment
+import io.treehouses.remote.fragments.SocksFragment
+import io.treehouses.remote.fragments.TorTabFragment
+import io.treehouses.remote.fragments.TunnelSSHFragment
 import io.treehouses.remote.pojo.ServiceInfo
 import java.util.*
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt
@@ -4,14 +4,12 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
 import android.os.Message
-import android.util.Log
 import android.view.View
 import android.widget.*
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
-import io.treehouses.remote.utils.LogUtils
 import io.treehouses.remote.utils.logD
 
 class ViewHolderBlocker internal constructor(v: View, context: Context?, listener: HomeInteractListener) {

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt
@@ -7,10 +7,8 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.Switch
 import android.widget.Toast
-import androidx.core.content.ContentProviderCompat.requireContext
-import com.google.android.material.textfield.TextInputEditText
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt
@@ -12,7 +12,7 @@ import android.widget.EditText
 import android.widget.Switch
 import android.widget.TextView
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.utils.Utils

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt
@@ -8,7 +8,7 @@ import android.widget.PopupMenu
 import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import io.treehouses.remote.R
-import io.treehouses.remote.SSH.beans.PubKeyBean
+import io.treehouses.remote.ssh.beans.PubKeyBean
 import io.treehouses.remote.callback.KeyMenuListener
 import io.treehouses.remote.databinding.RowKeyBinding
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt
@@ -8,7 +8,7 @@ import android.widget.Button
 import android.widget.Toast
 import com.google.android.material.textfield.TextInputEditText
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.utils.Utils.toast

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt
@@ -2,11 +2,11 @@ package io.treehouses.remote.adapter
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import io.treehouses.remote.SSH.beans.HostBean
-import io.treehouses.remote.callback.RVButtonClick
+import io.treehouses.remote.ssh.beans.HostBean
+import io.treehouses.remote.callback.RVButtonClickListener
 import io.treehouses.remote.databinding.RowSshBinding
 
-class ViewHolderSSHRow(private val binding: RowSshBinding, private val listener: RVButtonClick) : RecyclerView.ViewHolder(binding.root) {
+class ViewHolderSSHRow(private val binding: RowSshBinding, private val listener: RVButtonClickListener) : RecyclerView.ViewHolder(binding.root) {
     fun bind(host: HostBean) {
         binding.title.text = host.getPrettyFormat()
         binding.editButton.setOnClickListener {

diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt
@@ -4,12 +4,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
 import android.os.Message
-import android.util.Log
 import android.view.View
 import android.widget.Button
-import android.widget.RadioGroup
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.ui.home.HomeFragment

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
@@ -6,11 +6,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.Message
-import android.util.Log
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.utils.logE
 import java.lang.NullPointerException

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt
@@ -22,11 +22,11 @@ import com.trilead.ssh2.signature.ECDSASHA2Verify
 import com.trilead.ssh2.signature.Ed25519Verify
 import com.trilead.ssh2.signature.RSASHA1Verify
 import io.treehouses.remote.R
-import io.treehouses.remote.SSH.Ed25519Provider.Companion.insertIfNeeded
-import io.treehouses.remote.SSH.Terminal.TerminalBridge
-import io.treehouses.remote.SSH.Terminal.TerminalManager
-import io.treehouses.remote.SSH.beans.HostBean
-import io.treehouses.remote.SSH.beans.PubKeyBean
+import io.treehouses.remote.ssh.Ed25519Provider.Companion.insertIfNeeded
+import io.treehouses.remote.ssh.terminal.TerminalBridge
+import io.treehouses.remote.ssh.terminal.TerminalManager
+import io.treehouses.remote.ssh.beans.HostBean
+import io.treehouses.remote.ssh.beans.PubKeyBean
 import io.treehouses.remote.utils.KeyUtils
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt
@@ -7,21 +7,21 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import io.treehouses.remote.Fragments.DialogFragments.EditHostDialog
-import io.treehouses.remote.SSH.Terminal.TerminalManager
-import io.treehouses.remote.SSH.beans.HostBean
-import io.treehouses.remote.SSH.interfaces.OnHostStatusChangedListener
-import io.treehouses.remote.Views.RecyclerViewClickListener
+import io.treehouses.remote.fragments.dialogfragments.EditHostDialogFragment
+import io.treehouses.remote.ssh.terminal.TerminalManager
+import io.treehouses.remote.ssh.beans.HostBean
+import io.treehouses.remote.ssh.interfaces.OnHostStatusChangedListener
+import io.treehouses.remote.views.RecyclerViewClickListener
 import io.treehouses.remote.adapter.ViewHolderSSHRow
-import io.treehouses.remote.callback.RVButtonClick
+import io.treehouses.remote.callback.RVButtonClickListener
 import io.treehouses.remote.databinding.DialogSshBinding
 import io.treehouses.remote.databinding.RowSshBinding
 import io.treehouses.remote.utils.SaveUtils
 import io.treehouses.remote.utils.logD
 import java.lang.Exception
 import java.util.regex.Pattern
 
-open class BaseSSHConfig: BaseFragment(), RVButtonClick, OnHostStatusChangedListener {
+open class BaseSSHConfig: BaseFragment(), RVButtonClickListener, OnHostStatusChangedListener {
     protected val sshPattern = Pattern.compile("^(.+)@(([0-9a-z.-]+)|(\\[[a-f:0-9]+\\]))(:(\\d+))?$", Pattern.CASE_INSENSITIVE)
     protected lateinit var bind: DialogSshBinding
     protected lateinit var pastHosts: List<HostBean>
@@ -90,9 +90,9 @@ open class BaseSSHConfig: BaseFragment(), RVButtonClick, OnHostStatusChangedList
     }
 
     override fun onButtonClick(position: Int) {
-        val edit = EditHostDialog()
+        val edit = EditHostDialogFragment()
         edit.setOnDismissListener(DialogInterface.OnDismissListener { setUpAdapter() })
-        edit.arguments = Bundle().apply { putString(EditHostDialog.SELECTED_HOST_URI, pastHosts[position].uri.toString())}
+        edit.arguments = Bundle().apply { putString(EditHostDialogFragment.SELECTED_HOST_URI, pastHosts[position].uri.toString())}
         edit.show(childFragmentManager, "EditHost")
     }
 

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt
@@ -4,8 +4,8 @@ import android.view.View
 import android.widget.Toast
 import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
-import io.treehouses.remote.SSH.PubKeyUtils
-import io.treehouses.remote.SSH.beans.PubKeyBean
+import io.treehouses.remote.ssh.PubKeyUtils
+import io.treehouses.remote.ssh.beans.PubKeyBean
 import io.treehouses.remote.databinding.KeysDialogBinding
 import io.treehouses.remote.utils.KeyUtils
 import kotlinx.coroutines.*

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt
@@ -4,22 +4,20 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
-import android.util.Log
-import io.treehouses.remote.SSH.Colors
-import io.treehouses.remote.SSH.PromptHelper
-import io.treehouses.remote.SSH.Relay
-import io.treehouses.remote.SSH.SSH
-import io.treehouses.remote.SSH.Terminal.TerminalKeyListener
-import io.treehouses.remote.SSH.Terminal.TerminalManager
-import io.treehouses.remote.SSH.Terminal.TerminalView
-import io.treehouses.remote.SSH.beans.HostBean
-import io.treehouses.remote.SSH.beans.SelectionArea
-import io.treehouses.remote.SSH.interfaces.BridgeDisconnectedListener
-import io.treehouses.remote.SSH.interfaces.FontSizeChangedListener
-import io.treehouses.remote.Views.terminal.VDUBuffer
-import io.treehouses.remote.Views.terminal.VDUDisplay
-import io.treehouses.remote.Views.terminal.vt320
-import io.treehouses.remote.utils.LogUtils
+import io.treehouses.remote.ssh.Colors
+import io.treehouses.remote.ssh.PromptHelper
+import io.treehouses.remote.ssh.Relay
+import io.treehouses.remote.ssh.SSH
+import io.treehouses.remote.ssh.terminal.TerminalKeyListener
+import io.treehouses.remote.ssh.terminal.TerminalManager
+import io.treehouses.remote.ssh.terminal.TerminalView
+import io.treehouses.remote.ssh.beans.HostBean
+import io.treehouses.remote.ssh.beans.SelectionArea
+import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener
+import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener
+import io.treehouses.remote.views.terminal.VDUBuffer
+import io.treehouses.remote.views.terminal.VDUDisplay
+import io.treehouses.remote.views.terminal.vt320
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE
 import java.io.IOException

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt
@@ -14,9 +14,9 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 import com.google.gson.Gson
 import io.treehouses.remote.Constants
-import io.treehouses.remote.Fragments.DialogFragments.HelpDialog
-import io.treehouses.remote.Fragments.TerminalFragment
-import io.treehouses.remote.Network.BluetoothChatService
+import io.treehouses.remote.fragments.dialogfragments.HelpDialogFragment
+import io.treehouses.remote.fragments.TerminalFragment
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.R
 import io.treehouses.remote.databinding.ActivityTerminalFragmentBinding
 import io.treehouses.remote.pojo.CommandsList
@@ -234,7 +234,7 @@ open class BaseTerminalFragment : BaseFragment() {
     protected fun showHelpDialog(jsonString: String) {
         val b = Bundle()
         b.putString(Constants.JSON_STRING, jsonString)
-        val dialogFrag: DialogFragment = HelpDialog()
+        val dialogFrag: DialogFragment = HelpDialogFragment()
         dialogFrag.setTargetFragment(this, Constants.REQUEST_DIALOG_FRAGMENT)
         dialogFrag.arguments = b
         dialogFrag.show(requireActivity().supportFragmentManager.beginTransaction(), "helpDialog")

diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt
@@ -21,12 +21,12 @@ import androidx.preference.PreferenceManager
 import android.text.ClipboardManager
 import android.view.KeyCharacterMap
 import android.view.KeyEvent
-import io.treehouses.remote.Views.terminal.VDUBuffer
-import io.treehouses.remote.Views.terminal.vt320
+import io.treehouses.remote.views.terminal.VDUBuffer
+import io.treehouses.remote.views.terminal.vt320
 import io.treehouses.remote.PreferenceConstants
-import io.treehouses.remote.SSH.Terminal.TerminalBridge
-import io.treehouses.remote.SSH.Terminal.TerminalManager
-import io.treehouses.remote.SSH.beans.SelectionArea
+import io.treehouses.remote.ssh.terminal.TerminalBridge
+import io.treehouses.remote.ssh.terminal.TerminalManager
+import io.treehouses.remote.ssh.beans.SelectionArea
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE
 import java.io.IOException