diff --git a/components/auto_inline_icon/commons/auto_inline_icon.lua b/components/auto_inline_icon/commons/auto_inline_icon.lua
index aa663d38aac..6a20ba0aa3e 100644
--- a/components/auto_inline_icon/commons/auto_inline_icon.lua
+++ b/components/auto_inline_icon/commons/auto_inline_icon.lua
@@ -7,7 +7,7 @@
 
 local Class = require('Module:Class')
 local Lua = require('Module:Lua')
-local InlineIconAndText = require('Module:Widget/InlineIconAndText')
+local InlineIconAndText = require('Module:Widget/Misc/InlineIconAndText')
 local ManualData = Lua.requireIfExists('Module:InlineIcon/ManualData', {loadData = true})
 
 local AutoInlineIcon = {}
@@ -58,14 +58,14 @@ end
 ---@return IconWidget
 function AutoInlineIcon._iconCreator(data)
 	if data.iconType == 'image' then
-		local IconImage = require('Module:Widget/Icon/Image')
+		local IconImage = require('Module:Widget/Image/Icon/Image')
 		return IconImage{
 			imageLight = data.iconLight,
 			imageDark = data.iconDark,
 			link = data.link,
 		}
 	elseif data.iconType == 'fa' then
-		local IconFa = require('Module:Widget/Icon/Fontawesome')
+		local IconFa = require('Module:Widget/Image/Icon/Fontawesome')
 		return IconFa{
 			iconName = data.icon,
 			link = data.link,
diff --git a/components/widget/basic/widget_basic_button.lua b/components/widget/basic/widget_basic_button.lua
new file mode 100644
index 00000000000..1f803beea70
--- /dev/null
+++ b/components/widget/basic/widget_basic_button.lua
@@ -0,0 +1,73 @@
+---
+-- @Liquipedia
+-- wiki=commons
+-- page=Module:Widget/Basic/Button
+--
+-- Please see https://github.com/Liquipedia/Lua-Modules to contribute
+--
+
+local Class = require('Module:Class')
+local Lua = require('Module:Lua')
+
+local Widget = Lua.import('Module:Widget')
+local HtmlWidgets = Lua.import('Module:Widget/Html/All')
+local Link = Lua.import('Module:Widget/Basic/Link')
+local Div = HtmlWidgets.Div
+
+---@class ButtonWidgetParameters
+---@field title string?
+---@field link string?
+---@field linktype 'internal'|'external'|nil
+---@field variant 'primary'|'secondary'|'ghost'|nil
+---@field size 'sm'|'md'|'lg'|nil
+
+---@class ButtonWidget: Widget
+---@operator call(ButtonWidgetParameters): ButtonWidget
+
+local Button = Class.new(Widget)
+
+---@return Widget
+function Button:render()
+	--- MW Parser does not allowed the <button> tag, so we use a DIV for now instead
+	local cssClasses = {
+		'btn',
+		'btn-new',
+	}
+	if self.props.variant == 'primary' or self.props.variant == nil then
+		table.insert(cssClasses, 'btn-primary')
+	elseif self.props.variant == 'secondary' then
+		table.insert(cssClasses, 'btn-secondary')
+	end
+
+	if self.props.size == 'sm' then
+		table.insert(cssClasses, 'btn-small')
+	elseif self.props.size == 'lg' then
+		table.insert(cssClasses, 'btn-large')
+	end
+
+	local button = Div{
+		classes = cssClasses,
+		attributes = {
+			title = self.props.title,
+			['aria-label'] = self.props.title,
+			role = 'button',
+			tabindex = '0',
+		},
+		children = self.props.children,
+	}
+
+	if not self.props.link then
+		return button
+	end
+
+	-- Have to wrap it in an extra div to prevent the mediawiki parser from messing it up
+	return Div{children = {
+		Link{
+			link = self.props.link,
+			linktype = self.props.linktype,
+			children = {button},
+		}
+	}}
+end
+
+return Button
diff --git a/components/widget/widget_data_table.lua b/components/widget/basic/widget_basic_data_table.lua
similarity index 95%
rename from components/widget/widget_data_table.lua
rename to components/widget/basic/widget_basic_data_table.lua
index cab71da8a37..3e882cf0187 100644
--- a/components/widget/widget_data_table.lua
+++ b/components/widget/basic/widget_basic_data_table.lua
@@ -1,7 +1,7 @@
 ---
 -- @Liquipedia
 -- wiki=commons
--- page=Module:Widget/DataTable
+-- page=Module:Widget/Basic/DataTable
 --
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
diff --git a/components/widget/basic/widget_basic_link.lua b/components/widget/basic/widget_basic_link.lua
new file mode 100644
index 00000000000..9130ba6f2bd
--- /dev/null
+++ b/components/widget/basic/widget_basic_link.lua
@@ -0,0 +1,51 @@
+---
+-- @Liquipedia
+-- wiki=commons
+-- page=Module:Widget/Basic/Link
+--
+-- Please see https://github.com/Liquipedia/Lua-Modules to contribute
+--
+
+local Class = require('Module:Class')
+local Lua = require('Module:Lua')
+
+local HtmlWidgets = Lua.import('Module:Widget/Html/All')
+local Fragment = HtmlWidgets.Fragment
+local Widget = Lua.import('Module:Widget')
+local WidgetUtil = Lua.import('Module:Widget/Util')
+
+---@class LinkWidgetParameters
+---@field children (Widget|Html|string|number)[]
+---@field link string
+---@field linktype 'internal'|'external'|nil
+
+---@class LinkWidget: Widget
+---@operator call(LinkWidgetParameters): LinkWidget
+local Link = Class.new(Widget)
+
+---@return Widget
+function Link:render()
+	if self.props.linktype == 'external' then
+		return Fragment{
+			children = WidgetUtil.collect(
+				'[',
+				self.props.link,
+				' ',
+				unpack(self.props.children),
+				']'
+			)
+		}
+	end
+
+	return Fragment{
+		children = WidgetUtil.collect(
+			'[[',
+			self.props.link,
+			'|',
+			unpack(self.props.children),
+			']]'
+		)
+	}
+end
+
+return Link
diff --git a/components/widget/widget_icon.lua b/components/widget/image/widget_image_icon.lua
similarity index 51%
rename from components/widget/widget_icon.lua
rename to components/widget/image/widget_image_icon.lua
index 93a20c0b518..6bb4ba2b4f6 100644
--- a/components/widget/widget_icon.lua
+++ b/components/widget/image/widget_image_icon.lua
@@ -1,7 +1,7 @@
 ---
 -- @Liquipedia
 -- wiki=commons
--- page=Module:Widget/Icon
+-- page=Module:Widget/Image/Icon
 --
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
@@ -12,17 +12,12 @@ local Lua = require('Module:Lua')
 local Widget = Lua.import('Module:Widget')
 
 ---@class IconWidget: Widget
----@operator call(WidgetParameters): IconWidget
-local Icon = Class.new(
-	Widget,
-	function(self, input)
-	end
-)
+---@operator call(table): IconWidget
+local Icon = Class.new(Widget)
 
----@param children string[]
 ---@return string?
-function Icon:make(children)
-	error('Widget/Icon is an interface and should not be instantiated directly')
+function Icon:render()
+	error('Widget/Image/Icon is an interface and should not be instantiated directly')
 end
 
 return Icon
diff --git a/components/widget/widget_icon_fontawesome.lua b/components/widget/image/widget_image_icon_fontawesome.lua
similarity index 62%
rename from components/widget/widget_icon_fontawesome.lua
rename to components/widget/image/widget_image_icon_fontawesome.lua
index 4f93c795901..3434b84e5b2 100644
--- a/components/widget/widget_icon_fontawesome.lua
+++ b/components/widget/image/widget_image_icon_fontawesome.lua
@@ -1,7 +1,7 @@
 ---
 -- @Liquipedia
 -- wiki=commons
--- page=Module:Widget/Icon/Fontawesome
+-- page=Module:Widget/Image/Icon/Fontawesome
 --
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
@@ -10,21 +10,15 @@ local Class = require('Module:Class')
 local Icon = require('Module:Icon')
 local Lua = require('Module:Lua')
 
-local WidgetIcon = Lua.import('Module:Widget/Icon')
+local WidgetIcon = Lua.import('Module:Widget/Image/Icon')
 
 ---@class IconFontawesomeWidget: IconWidget
 ---@operator call(IconProps): IconFontawesomeWidget
 ---@field props IconProps
-local FontawesomeIcon = Class.new(
-	WidgetIcon,
-	function(self, input)
-		self.props = input
-	end
-)
+local FontawesomeIcon = Class.new(WidgetIcon)
 
----@param children string[]
 ---@return string?
-function FontawesomeIcon:make(children)
+function FontawesomeIcon:render()
 	return Icon.makeIcon(self.props)
 end
 
diff --git a/components/widget/widget_icon_image.lua b/components/widget/image/widget_image_icon_image.lua
similarity index 68%
rename from components/widget/widget_icon_image.lua
rename to components/widget/image/widget_image_icon_image.lua
index 5b67be0443c..ad087e70362 100644
--- a/components/widget/widget_icon_image.lua
+++ b/components/widget/image/widget_image_icon_image.lua
@@ -1,7 +1,7 @@
 ---
 -- @Liquipedia
 -- wiki=commons
--- page=Module:Widget/Icon/Image
+-- page=Module:Widget/Image/Icon/Image
 --
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
@@ -10,9 +10,9 @@ local Class = require('Module:Class')
 local Image = require('Module:Image')
 local Lua = require('Module:Lua')
 
-local WidgetIcon = Lua.import('Module:Widget/Icon')
+local WidgetIcon = Lua.import('Module:Widget/Image/Icon')
 
----@class IconImageWidgetParameters: WidgetParameters
+---@class IconImageWidgetParameters
 ---@field imageLight string?
 ---@field imageDark string?
 ---@field link string?
@@ -20,16 +20,10 @@ local WidgetIcon = Lua.import('Module:Widget/Icon')
 ---@class IconImageWidget: IconWidget
 ---@operator call(IconImageWidgetParameters): IconImageWidget
 ---@field props IconImageWidgetParameters
-local Icon = Class.new(
-	WidgetIcon,
-	function(self, input)
-		self.props = input
-	end
-)
+local Icon = Class.new(WidgetIcon)
 
----@param children string[]
 ---@return string?
-function Icon:make(children)
+function Icon:render()
 	return Image.display(
 		self.props.imageLight,
 		self.props.imageDark,
diff --git a/components/widget/misc/widget_misc_inline_icon_and_text.lua b/components/widget/misc/widget_misc_inline_icon_and_text.lua
new file mode 100644
index 00000000000..4958ffc2e7c
--- /dev/null
+++ b/components/widget/misc/widget_misc_inline_icon_and_text.lua
@@ -0,0 +1,44 @@
+---
+-- @Liquipedia
+-- wiki=commons
+-- page=Module:Widget/Misc/InlineIconAndText
+--
+-- Please see https://github.com/Liquipedia/Lua-Modules to contribute
+--
+
+local Class = require('Module:Class')
+local Lua = require('Module:Lua')
+
+local Widget = Lua.import('Module:Widget')
+local HtmlWidgets = Lua.import('Module:Widget/Html/All')
+
+local Link = Lua.import('Module:Widget/Basic/Link')
+local Span = HtmlWidgets.Span
+
+---@class InlineIconAndTextWidgetParameters
+---@field icon IconWidget
+---@field text string?
+---@field link string?
+
+---@class InlineIconAndTextWidget: Widget
+---@operator call(InlineIconAndTextWidgetParameters): InlineIconAndTextWidget
+
+local InlineIconAndText = Class.new(Widget)
+
+---@return Widget
+function InlineIconAndText:render()
+	return Span{
+		classes = {'image-link'},
+		children = {
+			self.props.icon,
+			' ',
+			Link{
+				link = self.props.link,
+				linktype = 'internal',
+				children = {self.props.text}
+			}
+		},
+	}
+end
+
+return InlineIconAndText
diff --git a/components/widget/widget_all.lua b/components/widget/widget_all.lua
index 9c517ee4cad..9d10eb4f3d5 100644
--- a/components/widget/widget_all.lua
+++ b/components/widget/widget_all.lua
@@ -30,7 +30,7 @@ Widgets.TableRow = Lua.import('Module:Widget/Table/Row')
 Widgets.TableCell = Lua.import('Module:Widget/Table/Cell')
 
 --- Data Table Widgets (html-table)
-Widgets.DataTable = Lua.import('Module:Widget/DataTable')
+Widgets.DataTable = Lua.import('Module:Widget/Basic/DataTable')
 
 --- Base Html Widgets
 Widgets.Div = Lua.import('Module:Widget/Html/Div')
diff --git a/components/widget/widget_button.lua b/components/widget/widget_button.lua
deleted file mode 100644
index 767276a364c..00000000000
--- a/components/widget/widget_button.lua
+++ /dev/null
@@ -1,78 +0,0 @@
----
--- @Liquipedia
--- wiki=commons
--- page=Module:Widget/Button
---
--- Please see https://github.com/Liquipedia/Lua-Modules to contribute
---
-
-local Class = require('Module:Class')
-local Lua = require('Module:Lua')
-
-local Widget = Lua.import('Module:Widget')
-local HtmlWidgets = Lua.import('Module:Widget/Html/All')
-local Link = Lua.import('Module:Widget/Link')
-local Div = HtmlWidgets.Div
-
----@class ButtonWidgetParameters: WidgetParameters
----@field title string?
----@field link string?
----@field linktype 'internal'|'external'|nil
----@field variant 'primary'|'secondary'|'ghost'|nil
----@field size 'sm'|'md'|'lg'|nil
-
----@class ButtonWidget: Widget
----@operator call(ButtonWidgetParameters): ButtonWidget
----@field title string?
----@field link string?
----@field linktype 'internal'|'external'
----@field variant 'primary'|'secondary'|'ghost'
----@field size 'sm'|'md'|'lg'
-
-local Button = Class.new(
-	Widget,
-	function(self, input)
-		self.title = input.title
-		self.link = input.link
-		self.linktype = input.linktype or 'internal'
-		self.variant = input.variant or 'primary'
-		self.size = input.size or 'md'
-	end
-)
-
----@param children string[]
----@return string
-function Button:make(children)
-	--- MW Parser does not allowed the <button> tag, so we use a div for now instead
-	local button = mw.html.create('div'):addClass('btn'):addClass('btn-new')
-	button:attr('title', self.title)
-	button:attr('aria-label', self.title)
-	button:attr('role', 'button')
-	button:attr('tabindex', '0')
-
-	button:wikitext(table.concat(children))
-
-	if self.variant == 'primary' then
-		button:addClass('btn-primary')
-	elseif self.variant == 'secondary' then
-		button:addClass('btn-secondary')
-	end
-
-	if self.size == 'sm' then
-		button:addClass('btn-small')
-	elseif self.size == 'lg' then
-		button:addClass('btn-large')
-	end
-
-	if not self.link then
-		return tostring(button)
-	end
-	-- Have to wrap it in an extra div to prevent the mediawiki parser from messing it up
-	return tostring(Div{children = {Link{
-		link = self.link,
-		linktype = self.linktype,
-		children = {button}
-	}}})
-end
-
-return Button
diff --git a/components/widget/widget_inline_icon_and_text.lua b/components/widget/widget_inline_icon_and_text.lua
deleted file mode 100644
index 70fef93b232..00000000000
--- a/components/widget/widget_inline_icon_and_text.lua
+++ /dev/null
@@ -1,54 +0,0 @@
----
--- @Liquipedia
--- wiki=commons
--- page=Module:Widget/InlineIconAndText
---
--- Please see https://github.com/Liquipedia/Lua-Modules to contribute
---
-
-local Class = require('Module:Class')
-local Lua = require('Module:Lua')
-
-local Widget = Lua.import('Module:Widget')
-local HtmlWidgets = Lua.import('Module:Widget/Html/All')
-
-local Link = Lua.import('Module:Widget/Link')
-local Span = HtmlWidgets.Span
-
----@class InlineIconAndTextWidgetParameters: WidgetParameters
----@field icon IconWidget
----@field text string?
----@field link string?
-
----@class InlineIconAndTextWidget: Widget
----@operator call(InlineIconAndTextWidgetParameters): InlineIconAndTextWidget
-
-local InlineIconAndText = Class.new(
-	Widget,
-	function(self, input)
-		local text = self:assertExistsAndCopy(input.text)
-		local link = self:assertExistsAndCopy(input.link)
-
-		local span = Span{
-			classes = {'image-link'},
-			children = {
-				input.icon,
-				' ',
-				Link{
-					link = link,
-					linktype = 'internal',
-					children = {text}
-				}
-			},
-		}
-		self.children = {span}
-	end
-)
-
----@param children string[]
----@return string
-function InlineIconAndText:make(children)
-	return table.concat(children)
-end
-
-return InlineIconAndText
diff --git a/components/widget/widget_link.lua b/components/widget/widget_link.lua
deleted file mode 100644
index 9668b24feb7..00000000000
--- a/components/widget/widget_link.lua
+++ /dev/null
@@ -1,39 +0,0 @@
----
--- @Liquipedia
--- wiki=commons
--- page=Module:Widget/Link
---
--- Please see https://github.com/Liquipedia/Lua-Modules to contribute
---
-
-local Class = require('Module:Class')
-local Lua = require('Module:Lua')
-
-local Widget = Lua.import('Module:Widget')
-
----@class LinkWidgetParameters: WidgetParameters
----@field link string
----@field linktype 'internal'|'external'|nil
-
----@class LinkWidget: Widget
----@operator call(LinkWidgetParameters): LinkWidget
----@field link string
----@field linktype 'internal'|'external'
-local Link = Class.new(
-	Widget,
-	function(self, input)
-		self.link = self:assertExistsAndCopy(input.link)
-		self.linktype = input.linktype or 'internal'
-	end
-)
-
----@param children string[]
----@return string?
-function Link:make(children)
-	if self.linktype == 'external' then
-		return '[' .. self.link .. ' '.. table.concat(children) .. ']'
-	end
-	return '[[' .. self.link .. '|'.. table.concat(children) .. ']]'
-end
-
-return Link
diff --git a/spec/test_helper.lua b/spec/test_helper.lua
index 23f0ea56c0e..484af84fd96 100644
--- a/spec/test_helper.lua
+++ b/spec/test_helper.lua
@@ -80,10 +80,13 @@ return function(busted, helper, options)
 		table.insert(paths, 'standard/links/commons/?.lua')
 		table.insert(paths, 'standard/tier/commons/?.lua')
 		table.insert(paths, 'components/widget/?.lua')
+		table.insert(paths, 'components/widget/basic/?.lua')
 		table.insert(paths, 'components/widget/contexts/?.lua')
 		table.insert(paths, 'components/widget/html/?.lua')
-		table.insert(paths, 'components/widget/squad/?.lua')
 		table.insert(paths, 'components/widget/infobox/?.lua')
+		table.insert(paths, 'components/widget/image/?.lua')
+		table.insert(paths, 'components/widget/misc/?.lua')
+		table.insert(paths, 'components/widget/squad/?.lua')
 
 		package.path = table.concat(paths, ';')
 	end
@@ -104,7 +107,7 @@ return function(busted, helper, options)
 
 	-- Top 10 wikis based on traffic
 	local wikis = {'dota2', 'valorant', 'counterstrike', 'rocketleague', 'mobilelegends', 'leagueoflegends', 'apexlegends', 'rainbowsix', 'overwatch', 'starcraft2'}
-	-- Warnings! Extremely time consuming!
+	-- Warnings! Extremely time consuming if different filesystems (eg. windows files with wsl)
 	local function allwikis(name, funcToRun, wikiArgs)
 		busted.executors.insulate('', function ()
 			for _, wiki in ipairs(wikis) do