diff --git a/plugin/banana.py b/python/plugin/banana.py
similarity index 100%
rename from plugin/banana.py
rename to python/plugin/banana.py
diff --git a/plugin/banana.vim b/python/plugin/banana.vim
similarity index 100%
rename from plugin/banana.vim
rename to python/plugin/banana.vim
diff --git a/plugin_vim/banana.vim b/vim_legacy/autoload/banana.vim
similarity index 81%
rename from plugin_vim/banana.vim
rename to vim_legacy/autoload/banana.vim
index 84cc612..a393ffd 100644
--- a/plugin_vim/banana.vim
+++ b/vim_legacy/autoload/banana.vim
@@ -1,25 +1,10 @@
-if exists("g:loaded_Banananew") || &cp
+if exists("g:autoloaded_Banananew") || &cp
 	finish
 endif
-let g:loaded_Banananew= 1 " your version number
-let s:keepcpo           = &cpo
-set cpo&vim
 
-if !hasmapto('<Plug>BananaEncnew')
-	map <unique> <Leader>c <Plug>BananaEncNew
-endif
-
-if !hasmapto('<Plug>BananaDecnew')
-	map <unique> <Leader>t <Plug>BananaDecNew
-endif
-
-noremap <silent> <unique> <script> <Plug>BananaEncNew
-			\ :call <SID>Enc()<CR>
-noremap <silent> <unique> <script> <Plug>BananaDecNew
-			\ :call <SID>Dec()<CR>
+let g:autoloaded_Banananew= 1 " your version number
 
-
-fun! s:Enc() range
+fun! banana#Enc() range
 	if line("'<") > 0
 		call s:ReplSel(s:Dec2Ban(s:GetSel()))
 	else
@@ -31,7 +16,7 @@ fun! s:EncLine()
 	call setline('.', substitute(getline('.'), '\d\d*', '\=toupper(s:Doban(submatch(0)))','g'))
 endfun!
 
-fun! s:Dec() range
+fun! banana#Dec() range
 	if line("'<") > 0
 		call s:ReplSel(s:Ban2Dec(s:GetSel()))
 	else
@@ -124,7 +109,3 @@ endfun!
 fun! s:Ban2Dec(text)
 	return substitute(a:text, '\C\u\u*', '\=s:Unban(tolower(submatch(0)))', 'g')
 endfun!
-
-let &cpo= s:keepcpo
-unlet s:keepcpo
-
diff --git a/vim_legacy/plugin/banana.vim b/vim_legacy/plugin/banana.vim
new file mode 100644
index 0000000..18d5a58
--- /dev/null
+++ b/vim_legacy/plugin/banana.vim
@@ -0,0 +1,27 @@
+if exists("g:loaded_Banananew") || &cp
+	finish
+endif
+let g:loaded_Banananew= 1 " your version number
+let s:keepcpo           = &cpo
+set cpo&vim
+
+if !hasmapto('<Plug>BananaEncnew')
+	map <unique> <Leader>c <Plug>BananaEncNew
+endif
+
+if !hasmapto('<Plug>BananaDecnew')
+	map <unique> <Leader>t <Plug>BananaDecNew
+endif
+
+"noremap <silent> <unique> <script> <Plug>BananaEncNew
+"			\ :call <SID>Enc()<CR>
+noremap <silent> <unique> <script> <Plug>BananaEncNew
+			\ :call banana#Enc()<CR>
+"noremap <silent> <unique> <script> <Plug>BananaDecNew
+"			\ :call <SID>Dec()<CR>
+noremap <silent> <unique> <script> <Plug>BananaDecNew
+			\ :call banana#Dec()<CR>
+
+let &cpo= s:keepcpo
+unlet s:keepcpo
+