diff --git a/plugin/SqueezeESP32/Graphics.pm b/plugin/SqueezeESP32/Graphics.pm
new file mode 100644
index 00000000..e5733ed6
--- /dev/null
+++ b/plugin/SqueezeESP32/Graphics.pm
@@ -0,0 +1,25 @@
+package Plugins::SqueezeESP32::Graphics;
+
+use strict;
+
+use base qw(Slim::Display::Squeezebox2);
+
+=comment
+sub bytesPerColumn {
+	return 4;
+}
+=cut
+
+sub displayHeight {
+	return 32;
+}
+
+sub displayWidth {
+	return shift->widthOverride(@_) || 128;
+}
+
+sub vfdmodel {
+	return 'graphic-128x32';
+}
+
+1;
\ No newline at end of file
diff --git a/plugin/Player.pm b/plugin/SqueezeESP32/Player.pm
similarity index 100%
rename from plugin/Player.pm
rename to plugin/SqueezeESP32/Player.pm
diff --git a/plugin/Plugin.pm b/plugin/SqueezeESP32/Plugin.pm
similarity index 93%
rename from plugin/Plugin.pm
rename to plugin/SqueezeESP32/Plugin.pm
index fbd939e7..623ebbea 100644
--- a/plugin/Plugin.pm
+++ b/plugin/SqueezeESP32/Plugin.pm
@@ -20,7 +20,7 @@ sub initPlugin {
 	my $class = shift;
 
 	$class->SUPER::initPlugin(@_);
-	Slim::Networking::Slimproto::addPlayerClass($class, 100, 'squeeze2esp32', { client => 'Plugins::SqueezeESP32::Player', display => 'Plugins::SqueezeESP32::Text' });
+	Slim::Networking::Slimproto::addPlayerClass($class, 100, 'squeeze2esp32', { client => 'Plugins::SqueezeESP32::Player', display => 'Plugins::SqueezeESP32::Graphics' });
 	$log->info("Added class 100 for SqueezeESP32");
 }
 
diff --git a/plugin/Text.pm b/plugin/SqueezeESP32/Text.pm
similarity index 75%
rename from plugin/Text.pm
rename to plugin/SqueezeESP32/Text.pm
index c6e1700d..3106a67a 100644
--- a/plugin/Text.pm
+++ b/plugin/SqueezeESP32/Text.pm
@@ -5,6 +5,9 @@ use strict;
 use base qw(Slim::Display::Text);
 
 # we don't want the special Noritake codes
-sub vfdmodel { 'squeezeslave' }
+sub vfdmodel {
+	return 'squeezeslave'';
+}
+
 
 1;
\ No newline at end of file
diff --git a/plugin/install.xml b/plugin/SqueezeESP32/install.xml
similarity index 100%
rename from plugin/install.xml
rename to plugin/SqueezeESP32/install.xml
diff --git a/plugin/strings.txt b/plugin/SqueezeESP32/strings.txt
similarity index 100%
rename from plugin/strings.txt
rename to plugin/SqueezeESP32/strings.txt