14 files changed, 3 insertions, 33 deletions
diff --git a/src/cookie_fix.cr b/src/cookie_fix.cr
deleted file mode 100644
index 1c0345e0..00000000
--- a/src/cookie_fix.cr
+++ /dev/null
@@ -1,29 +0,0 @@
-# See https://github.com/crystal-lang/crystal/pull/5408
-module HTTP
-  class Cookie
-    module Parser
-      SetCookieStringFix = /^#{Regex::CookiePair}(?:;\s*#{Regex::CookieAV})*$/
-
-      def parse_set_cookie(header)
-        match = header.match(SetCookieStringFix)
-        return unless match
-
-        expires = if max_age = match["max_age"]?
-                    Time.now + max_age.to_i.seconds
-                  else
-                    parse_time(match["expires"]?)
-                  end
-
-        Cookie.new(
-          match["name"], match["value"],
-          path: match["path"]? || "/",
-          expires: expires,
-          domain: match["domain"]?,
-          secure: match["secure"]? != nil,
-          http_only: match["http_only"]? != nil,
-          extension: match["extension"]?
-        )
-      end
-    end
-  end
-end
diff --git a/src/invidious.cr b/src/invidious.cr
index 0d085478..22c91865 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -20,8 +20,7 @@ require "option_parser"
 require "pg"
 require "xml"
 require "yaml"
-require "./cookie_fix"
-require "./helpers"
+require "./invidious/*"
 
 CONFIG = Config.from_yaml(File.read("config/config.yml"))
 
diff --git a/src/helpers.cr b/src/invidious/helpers.cr
index e8408d4b..0df3f06f 100644
--- a/src/helpers.cr
+++ b/src/invidious/helpers.cr
@@ -10,11 +10,11 @@ macro add_mapping(mapping)
 end
 
 macro templated(filename)
-  render "src/views/#{{{filename}}}.ecr", "src/views/layout.ecr"
+  render "src/invidious/views/#{{{filename}}}.ecr", "src/invidious/views/layout.ecr"
 end
 
 macro rendered(filename)
-  render "src/views/#{{{filename}}}.ecr"
+  render "src/invidious/views/#{{{filename}}}.ecr"
 end
 
 class Config
diff --git a/src/views/channel.ecr b/src/invidious/views/channel.ecr
index e67dbfda..e67dbfda 100644
--- a/src/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
diff --git a/src/views/components/subscription_video.ecr b/src/invidious/views/components/subscription_video.ecr
index 377f51cb..377f51cb 100644
--- a/src/views/components/subscription_video.ecr
+++ b/src/invidious/views/components/subscription_video.ecr
diff --git a/src/views/components/video.ecr b/src/invidious/views/components/video.ecr
index 804080cc..804080cc 100644
--- a/src/views/components/video.ecr
+++ b/src/invidious/views/components/video.ecr
diff --git a/src/views/error.ecr b/src/invidious/views/error.ecr
index 65ec9513..65ec9513 100644
--- a/src/views/error.ecr
+++ b/src/invidious/views/error.ecr
diff --git a/src/views/index.ecr b/src/invidious/views/index.ecr
index f58a6d89..f58a6d89 100644
--- a/src/views/index.ecr
+++ b/src/invidious/views/index.ecr
diff --git a/src/views/layout.ecr b/src/invidious/views/layout.ecr
index 11ea7b48..11ea7b48 100644
--- a/src/views/layout.ecr
+++ b/src/invidious/views/layout.ecr
diff --git a/src/views/login.ecr b/src/invidious/views/login.ecr
index 9d886608..9d886608 100644
--- a/src/views/login.ecr
+++ b/src/invidious/views/login.ecr
diff --git a/src/views/search.ecr b/src/invidious/views/search.ecr
index ba47f546..ba47f546 100644
--- a/src/views/search.ecr
+++ b/src/invidious/views/search.ecr
diff --git a/src/views/subscription_manager.ecr b/src/invidious/views/subscription_manager.ecr
index 23afa609..23afa609 100644
--- a/src/views/subscription_manager.ecr
+++ b/src/invidious/views/subscription_manager.ecr
diff --git a/src/views/subscriptions.ecr b/src/invidious/views/subscriptions.ecr
index f2411b24..f2411b24 100644
--- a/src/views/subscriptions.ecr
+++ b/src/invidious/views/subscriptions.ecr
diff --git a/src/views/watch.ecr b/src/invidious/views/watch.ecr
index dc8e4258..dc8e4258 100644
--- a/src/views/watch.ecr
+++ b/src/invidious/views/watch.ecr