diff --git a/BSA Browser CLI/Arguments.cs b/BSA Browser CLI/Arguments.cs
new file mode 100644
index 0000000..561b643
--- /dev/null
+++ b/BSA Browser CLI/Arguments.cs	
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using BSA_Browser_CLI.Filtering;
+
+namespace BSA_Browser_CLI
+{
+    [Flags]
+    internal enum ListOptions
+    {
+        None = 0,
+        Archive = 1,
+        FullPath = 2,
+        FileSize = 4
+    }
+
+    internal class Arguments
+    {
+        public bool Extract { get; private set; }
+        public bool Help { get; private set; }
+        public bool List { get; private set; }
+        public bool Overwrite { get; private set; }
+        public bool IgnoreErrors { get; private set; }
+        public bool MatchTimeChanged { get; private set; }
+        public bool NoHeaders { get; private set; }
+
+        public ListOptions ListOptions { get; private set; } = ListOptions.None;
+
+        public string Destination { get; private set; }
+
+        public Encoding Encoding { get; private set; } = Encoding.UTF7;
+
+        public IReadOnlyCollection<string> Inputs { get; private set; }
+        public IReadOnlyCollection<Filter> Filters { get; private set; }
+
+        public Arguments(string[] args)
+        {
+            var input = new List<string>();
+            var filters = new List<Filter>();
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                string arg = args[i];
+
+                if (arg.StartsWith("/") || arg.StartsWith("-") || arg.StartsWith("--"))
+                {
+                    switch (arg.ToLower().Split(':', '=')[0])
+                    {
+                        case "/?":
+                        case "-h":
+                        case "--help":
+                            this.Help = true;
+                            break;
+                        case "/e":
+                        case "-e":
+                            this.Extract = true;
+                            break;
+                        case "/f":
+                        case "-f":
+                            filters.Add(new Filter(FilteringTypes.Simple, args[++i]));
+                            break;
+                        case "/i":
+                        case "-i":
+                            this.IgnoreErrors = true;
+                            break;
+                        case "/l":
+                        case "-l":
+                            this.List = true;
+
+                            char[] options = arg.Split(':', '=').Last().ToLower().ToCharArray();
+
+                            if (options.Contains('a')) this.ListOptions = ListOptions.Archive;
+                            if (options.Contains('f')) this.ListOptions |= ListOptions.FullPath;
+                            if (options.Contains('s')) this.ListOptions |= ListOptions.FileSize;
+
+                            break;
+                        case "/regex":
+                        case "--regex":
+                            filters.Add(new Filter(FilteringTypes.Regex, args[++i]));
+                            break;
+                        case "/enc":
+                        case "--enc":
+                        case "/encoding":
+                        case "--encoding":
+                            this.Encoding = this.ParseEncoding(args[++i]);
+                            break;
+                        case "--exclude":
+                        case "/exclude":
+                            filters.Add(new Filter(FilteringTypes.SimpleExclude, args[++i]));
+                            break;
+                        case "/mtc":
+                        case "--mtc":
+                            this.MatchTimeChanged = true;
+                            break;
+                        case "/noheaders":
+                        case "--noheaders":
+                            this.NoHeaders = true;
+                            break;
+                        case "/o":
+                        case "-o":
+                        case "/overwrite":
+                        case "--overwrite":
+                            this.Overwrite = true;
+                            break;
+                        default:
+                            throw new ArgumentException("Unrecognized argument: " + arg);
+                    }
+                }
+                else
+                {
+                    if (i == args.Length - 1 && this.Extract) // Last item is destination when extracting
+                    {
+                        if (Directory.Exists(arg))
+                            this.Destination = arg;
+                        else
+                            throw new DirectoryNotFoundException("Destination directory not found.");
+                    }
+                    else if (File.Exists(arg))
+                    {
+                        input.Add(arg);
+                    }
+                    else
+                    {
+                        throw new FileNotFoundException("File not found.", arg);
+                    }
+                }
+            }
+
+            this.Inputs = input.AsReadOnly();
+            this.Filters = filters.AsReadOnly();
+        }
+
+        private Encoding ParseEncoding(string encoding)
+        {
+            switch (encoding.ToLower())
+            {
+                case "utf7": return Encoding.UTF7;
+                case "system": return Encoding.Default;
+                case "ascii": return Encoding.ASCII;
+                case "unicode": return Encoding.Unicode;
+                case "utf32": return Encoding.UTF32;
+                case "utf8": return Encoding.UTF8;
+                default:
+                    throw new ArgumentException("Unrecognized encoding: " + encoding);
+            }
+        }
+    }
+}
diff --git a/BSA Browser CLI/BSA Browser CLI.csproj b/BSA Browser CLI/BSA Browser CLI.csproj
index 7be0669..a5b00c1 100644
--- a/BSA Browser CLI/BSA Browser CLI.csproj	
+++ b/BSA Browser CLI/BSA Browser CLI.csproj	
@@ -62,6 +62,7 @@ Only *.allowedextension files will be included, which doesn't exist in my case.
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Arguments.cs" />
     <Compile Include="Filtering\Filter.cs" />
     <Compile Include="Filtering\FilteringTypes.cs" />
     <Compile Include="Filtering\FilterPredicateRegex.cs" />
diff --git a/BSA Browser CLI/Program.cs b/BSA Browser CLI/Program.cs
index 4936315..814b5b9 100644
--- a/BSA Browser CLI/Program.cs	
+++ b/BSA Browser CLI/Program.cs	
@@ -2,154 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using BSA_Browser_CLI.Filtering;
 using SharpBSABA2;
 using SharpBSABA2.BA2Util;
 
 namespace BSA_Browser_CLI
 {
-    [Flags]
-    enum ListOptions
-    {
-        None = 0,
-        Archive = 1,
-        FullPath = 2,
-        FileSize = 4
-    }
-
-    class Arguments
-    {
-        public bool Extract { get; private set; }
-        public bool Help { get; private set; }
-        public bool List { get; private set; }
-        public bool Overwrite { get; private set; }
-        public bool IgnoreErrors { get; private set; }
-        public bool MatchTimeChanged { get; private set; }
-        public bool NoHeaders { get; private set; }
-
-        public ListOptions ListOptions { get; private set; } = ListOptions.None;
-
-        public string Destination { get; private set; }
-
-        public Encoding Encoding { get; private set; } = Encoding.UTF7;
-
-        public IReadOnlyCollection<string> Inputs { get; private set; }
-        public IReadOnlyCollection<Filter> Filters { get; private set; }
-
-        public Arguments(string[] args)
-        {
-            var input = new List<string>();
-            var filters = new List<Filter>();
-
-            for (int i = 0; i < args.Length; i++)
-            {
-                string arg = args[i];
-
-                if (arg.StartsWith("/") || arg.StartsWith("-") || arg.StartsWith("--"))
-                {
-                    switch (arg.ToLower().Split(':', '=')[0])
-                    {
-                        case "/?":
-                        case "-h":
-                        case "--help":
-                            this.Help = true;
-                            break;
-                        case "/e":
-                        case "-e":
-                            this.Extract = true;
-                            break;
-                        case "/f":
-                        case "-f":
-                            filters.Add(new Filter(FilteringTypes.Simple, args[++i]));
-                            break;
-                        case "/i":
-                        case "-i":
-                            this.IgnoreErrors = true;
-                            break;
-                        case "/l":
-                        case "-l":
-                            this.List = true;
-
-                            char[] options = arg.Split(':', '=').Last().ToLower().ToCharArray();
-
-                            if (options.Contains('a')) this.ListOptions = ListOptions.Archive;
-                            if (options.Contains('f')) this.ListOptions |= ListOptions.FullPath;
-                            if (options.Contains('s')) this.ListOptions |= ListOptions.FileSize;
-
-                            break;
-                        case "/regex":
-                        case "--regex":
-                            filters.Add(new Filter(FilteringTypes.Regex, args[++i]));
-                            break;
-                        case "/enc":
-                        case "--enc":
-                        case "/encoding":
-                        case "--encoding":
-                            this.Encoding = this.ParseEncoding(args[++i]);
-                            break;
-                        case "--exclude":
-                        case "/exclude":
-                            filters.Add(new Filter(FilteringTypes.SimpleExclude, args[++i]));
-                            break;
-                        case "/mtc":
-                        case "--mtc":
-                            this.MatchTimeChanged = true;
-                            break;
-                        case "/noheaders":
-                        case "--noheaders":
-                            this.NoHeaders = true;
-                            break;
-                        case "/o":
-                        case "-o":
-                        case "/overwrite":
-                        case "--overwrite":
-                            this.Overwrite = true;
-                            break;
-                        default:
-                            throw new ArgumentException("Unrecognized argument: " + arg);
-                    }
-                }
-                else
-                {
-                    if (i == args.Length - 1 && this.Extract) // Last item is destination when extracting
-                    {
-                        if (Directory.Exists(arg))
-                            this.Destination = arg;
-                        else
-                            throw new DirectoryNotFoundException("Destination directory not found.");
-                    }
-                    else if (File.Exists(arg))
-                    {
-                        input.Add(arg);
-                    }
-                    else
-                    {
-                        throw new FileNotFoundException("File not found.", arg);
-                    }
-                }
-            }
-
-            this.Inputs = input.AsReadOnly();
-            this.Filters = filters.AsReadOnly();
-        }
-
-        private Encoding ParseEncoding(string encoding)
-        {
-            switch (encoding.ToLower())
-            {
-                case "utf7": return Encoding.UTF7;
-                case "system": return Encoding.Default;
-                case "ascii": return Encoding.ASCII;
-                case "unicode": return Encoding.Unicode;
-                case "utf32": return Encoding.UTF32;
-                case "utf8": return Encoding.UTF8;
-                default:
-                    throw new ArgumentException("Unrecognized encoding: " + encoding);
-            }
-        }
-    }
-
     class Program
     {
         private const int ERROR_INVALID_FUNCTION = 1;