diff --git a/config/core/cursor_line_column.vim b/core/cursor_line_column.vim
similarity index 100%
rename from config/core/cursor_line_column.vim
rename to core/cursor_line_column.vim
diff --git a/config/core/escape.vim b/core/escape.vim
similarity index 100%
rename from config/core/escape.vim
rename to core/escape.vim
diff --git a/config/core/folding.vim b/core/folding.vim
similarity index 100%
rename from config/core/folding.vim
rename to core/folding.vim
diff --git a/config/core/help.vim b/core/help.vim
similarity index 100%
rename from config/core/help.vim
rename to core/help.vim
diff --git a/config/core/ident.vim b/core/ident.vim
similarity index 100%
rename from config/core/ident.vim
rename to core/ident.vim
diff --git a/config/core/invlist.vim b/core/invlist.vim
similarity index 100%
rename from config/core/invlist.vim
rename to core/invlist.vim
diff --git a/config/core/leaderkey.vim b/core/leaderkey.vim
similarity index 100%
rename from config/core/leaderkey.vim
rename to core/leaderkey.vim
diff --git a/config/core/line_numbers.vim b/core/line_numbers.vim
similarity index 100%
rename from config/core/line_numbers.vim
rename to core/line_numbers.vim
diff --git a/config/core/movement.vim b/core/movement.vim
similarity index 100%
rename from config/core/movement.vim
rename to core/movement.vim
diff --git a/config/core/my_vim.vim b/core/my_vim.vim
similarity index 100%
rename from config/core/my_vim.vim
rename to core/my_vim.vim
diff --git a/config/core/options.vim b/core/options.vim
similarity index 100%
rename from config/core/options.vim
rename to core/options.vim
diff --git a/config/core/plugins.vim b/core/plugins.vim
similarity index 94%
rename from config/core/plugins.vim
rename to core/plugins.vim
index 4269c24..2d0197d 100644
--- a/config/core/plugins.vim
+++ b/core/plugins.vim
@@ -14,13 +14,13 @@ Plug 'junegunn/seoul256.vim'
 Plug 'scrooloose/nerdtree',             { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/nerdtree-git-plugin',  { 'on': 'NERDTreeToggle' }
 
-if version >= 704
+if v:version >= 704
 Plug 'vim-pandoc/vim-pandoc'
 Plug 'vim-pandoc/vim-pandoc-syntax'
 Plug 'Valloric/YouCompleteMe',          { 'do': './install.sh --clang-completer --system-libclang' }
 endif
 
-if version >= 703
+if v:version >= 703
 Plug 'vim-scripts/Gundo',               { 'on': 'GundoToggle' }
 endif
 
diff --git a/config/core/quit.vim b/core/quit.vim
similarity index 100%
rename from config/core/quit.vim
rename to core/quit.vim
diff --git a/config/core/readonly_files.vim b/core/readonly_files.vim
similarity index 100%
rename from config/core/readonly_files.vim
rename to core/readonly_files.vim
diff --git a/config/core/replace.vim b/core/replace.vim
similarity index 100%
rename from config/core/replace.vim
rename to core/replace.vim
diff --git a/config/core/search.vim b/core/search.vim
similarity index 100%
rename from config/core/search.vim
rename to core/search.vim
diff --git a/config/core/tabs.vim b/core/tabs.vim
similarity index 100%
rename from config/core/tabs.vim
rename to core/tabs.vim
diff --git a/config/core/tabstops.vim b/core/tabstops.vim
similarity index 100%
rename from config/core/tabstops.vim
rename to core/tabstops.vim
diff --git a/config/core/undo.vim b/core/undo.vim
similarity index 100%
rename from config/core/undo.vim
rename to core/undo.vim
diff --git a/config/core/wildmenu.vim b/core/wildmenu.vim
similarity index 100%
rename from config/core/wildmenu.vim
rename to core/wildmenu.vim
diff --git a/config/core/write_and_quit.vim b/core/write_and_quit.vim
similarity index 100%
rename from config/core/write_and_quit.vim
rename to core/write_and_quit.vim