diff --git a/addon-info.json b/addon-info.json
deleted file mode 100644
index 77e3f1e..0000000
--- a/addon-info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "requirements",
-  "description": "the Requirements File Format syntax support for Vim",
-  "version": "1.8.0",
-  "author": "raimon",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/raimon49/requirements.txt.vim"
-  }
-}
diff --git a/autoload/requirements/scripts.vim b/autoload/requirements.vim
similarity index 79%
rename from autoload/requirements/scripts.vim
rename to autoload/requirements.vim
index 9a90038..63dd19b 100644
--- a/autoload/requirements/scripts.vim
+++ b/autoload/requirements.vim
@@ -1,8 +1,9 @@
 ""
-" Refer $VIMRUNTIME/autoload/dist/script.vim in vim
-" or $VIMRUNTIME/scripts.vim in neovim. When a file's shebang is like
-" "pip install -r" or "pip-compile", set its filetype to |requirements|.
-function! requirements#scripts#shabang() abort
+" Refer https://github.com/vim/vim/blob/75e27d78f5370e7d2e0898326d9b080937e7b090/runtime/scripts.vim#L33-L71
+"
+" When a file's shebang is "pip install -r" or "pip-compile",
+" set its filetype to |requirements|.
+function! requirements#shebang() abort
     let s:line1 = getline(1)
 
     if s:line1 =~# "^#!"
diff --git a/autoload/requirements/utils.vim b/autoload/requirements/utils.vim
deleted file mode 100644
index dbe8c9f..0000000
--- a/autoload/requirements/utils.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-""
-" @section Configuration, config
-
-function! s:Flag(name, default) abort
-    let l:scope = get(split(a:name, ':'), 0, 'g:')
-    let l:name = get(split(a:name, ':'), -1)
-    let {l:scope}:{l:name} = get({l:scope}:, l:name, a:default)
-endfunction
-
-let g:requirements#utils#plugin = {'Flag': funcref('s:Flag')}
-" vim: et sw=4 ts=4 sts=4:
diff --git a/ftdetect/requirements.vim b/ftdetect/requirements.vim
index b8c4d9a..c3388e4 100644
--- a/ftdetect/requirements.vim
+++ b/ftdetect/requirements.vim
@@ -59,7 +59,7 @@ augroup requirements
     autocmd!
     au BufNewFile,BufRead *.{txt,in} if s:isRequirementsFile() | set ft=requirements | endif
     au BufNewFile,BufRead *.pip set ft=requirements
-    au BufNewFile,BufRead * if !did_filetype() | call requirements#scripts#shabang() | endif
+    au BufNewFile,BufRead * if !did_filetype() | call requirements#shebang() | endif
 augroup END
 
 " vim: et sw=4 ts=4 sts=4: