diff --git a/mainwindow.cpp b/mainwindow.cpp
index 69ccdf5..b71f790 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1850,7 +1850,7 @@ QString MainWindow::getDocumentsLocation()
 
     if(currentfile.isEmpty()) {
         path = QStandardPaths::locate(QStandardPaths::DocumentsLocation,
-                "newRPL", QStandardPaths::LocateDirectory);
+                "newRPL Files", QStandardPaths::LocateDirectory);
         if(path.isEmpty())
             path = QStandardPaths::writableLocation(QStandardPaths::
                     DocumentsLocation);
diff --git a/newrpl/LICENSE.txt b/newrpl/LICENSE.txt
index acde649..54c97b3 100644
--- a/newrpl/LICENSE.txt
+++ b/newrpl/LICENSE.txt
@@ -1,4 +1,7 @@
-Copyright (c) 2014, Claudio Lapilli and the newRPL Team
+newRPL license
+---------------
+
+Copyright (c) 2014 to 2021, Claudio Lapilli and the newRPL Team
 
 All rights reserved.
 
diff --git a/tools/prime-installer/.gitignore b/tools/prime-bundler/.gitignore
similarity index 100%
rename from tools/prime-installer/.gitignore
rename to tools/prime-bundler/.gitignore
diff --git a/tools/prime-installer/binaries/MultiBoot.bin b/tools/prime-bundler/binaries/MultiBoot.bin
similarity index 100%
rename from tools/prime-installer/binaries/MultiBoot.bin
rename to tools/prime-bundler/binaries/MultiBoot.bin
diff --git a/tools/prime-installer/bitmap/icon.png b/tools/prime-bundler/bitmap/icon.png
similarity index 100%
rename from tools/prime-installer/bitmap/icon.png
rename to tools/prime-bundler/bitmap/icon.png
diff --git a/tools/prime-installer/fsystem/fatconvert.c b/tools/prime-bundler/fsystem/fatconvert.c
similarity index 100%
rename from tools/prime-installer/fsystem/fatconvert.c
rename to tools/prime-bundler/fsystem/fatconvert.c
diff --git a/tools/prime-installer/fsystem/fsallocator.c b/tools/prime-bundler/fsystem/fsallocator.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsallocator.c
rename to tools/prime-bundler/fsystem/fsallocator.c
diff --git a/tools/prime-installer/fsystem/fsattr.c b/tools/prime-bundler/fsystem/fsattr.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsattr.c
rename to tools/prime-bundler/fsystem/fsattr.c
diff --git a/tools/prime-installer/fsystem/fscalcfreespace.c b/tools/prime-bundler/fsystem/fscalcfreespace.c
similarity index 100%
rename from tools/prime-installer/fsystem/fscalcfreespace.c
rename to tools/prime-bundler/fsystem/fscalcfreespace.c
diff --git a/tools/prime-installer/fsystem/fschattr.c b/tools/prime-bundler/fsystem/fschattr.c
similarity index 100%
rename from tools/prime-installer/fsystem/fschattr.c
rename to tools/prime-bundler/fsystem/fschattr.c
diff --git a/tools/prime-installer/fsystem/fschdir.c b/tools/prime-bundler/fsystem/fschdir.c
similarity index 100%
rename from tools/prime-installer/fsystem/fschdir.c
rename to tools/prime-bundler/fsystem/fschdir.c
diff --git a/tools/prime-installer/fsystem/fschmode.c b/tools/prime-bundler/fsystem/fschmode.c
similarity index 100%
rename from tools/prime-installer/fsystem/fschmode.c
rename to tools/prime-bundler/fsystem/fschmode.c
diff --git a/tools/prime-installer/fsystem/fsclose.c b/tools/prime-bundler/fsystem/fsclose.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsclose.c
rename to tools/prime-bundler/fsystem/fsclose.c
diff --git a/tools/prime-installer/fsystem/fscloseanddelete.c b/tools/prime-bundler/fsystem/fscloseanddelete.c
similarity index 100%
rename from tools/prime-installer/fsystem/fscloseanddelete.c
rename to tools/prime-bundler/fsystem/fscloseanddelete.c
diff --git a/tools/prime-installer/fsystem/fsconvert2shortentry.c b/tools/prime-bundler/fsystem/fsconvert2shortentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsconvert2shortentry.c
rename to tools/prime-bundler/fsystem/fsconvert2shortentry.c
diff --git a/tools/prime-installer/fsystem/fscreate.c b/tools/prime-bundler/fsystem/fscreate.c
similarity index 100%
rename from tools/prime-installer/fsystem/fscreate.c
rename to tools/prime-bundler/fsystem/fscreate.c
diff --git a/tools/prime-installer/fsystem/fsdelete.c b/tools/prime-bundler/fsystem/fsdelete.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsdelete.c
rename to tools/prime-bundler/fsystem/fsdelete.c
diff --git a/tools/prime-installer/fsystem/fsdeletedirentry.c b/tools/prime-bundler/fsystem/fsdeletedirentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsdeletedirentry.c
rename to tools/prime-bundler/fsystem/fsdeletedirentry.c
diff --git a/tools/prime-installer/fsystem/fseof.c b/tools/prime-bundler/fsystem/fseof.c
similarity index 100%
rename from tools/prime-installer/fsystem/fseof.c
rename to tools/prime-bundler/fsystem/fseof.c
diff --git a/tools/prime-installer/fsystem/fsexpandchain.c b/tools/prime-bundler/fsystem/fsexpandchain.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsexpandchain.c
rename to tools/prime-bundler/fsystem/fsexpandchain.c
diff --git a/tools/prime-installer/fsystem/fsfileisopen.c b/tools/prime-bundler/fsystem/fsfileisopen.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfileisopen.c
rename to tools/prime-bundler/fsystem/fsfileisopen.c
diff --git a/tools/prime-installer/fsystem/fsfileisreferenced.c b/tools/prime-bundler/fsystem/fsfileisreferenced.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfileisreferenced.c
rename to tools/prime-bundler/fsystem/fsfileisreferenced.c
diff --git a/tools/prime-installer/fsystem/fsfilelength.c b/tools/prime-bundler/fsystem/fsfilelength.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfilelength.c
rename to tools/prime-bundler/fsystem/fsfilelength.c
diff --git a/tools/prime-installer/fsystem/fsfindchar.c b/tools/prime-bundler/fsystem/fsfindchar.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfindchar.c
rename to tools/prime-bundler/fsystem/fsfindchar.c
diff --git a/tools/prime-installer/fsystem/fsfindentry.c b/tools/prime-bundler/fsystem/fsfindentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfindentry.c
rename to tools/prime-bundler/fsystem/fsfindentry.c
diff --git a/tools/prime-installer/fsystem/fsfindfile.c b/tools/prime-bundler/fsystem/fsfindfile.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfindfile.c
rename to tools/prime-bundler/fsystem/fsfindfile.c
diff --git a/tools/prime-installer/fsystem/fsfindforcreation.c b/tools/prime-bundler/fsystem/fsfindforcreation.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfindforcreation.c
rename to tools/prime-bundler/fsystem/fsfindforcreation.c
diff --git a/tools/prime-installer/fsystem/fsflushbuffers.c b/tools/prime-bundler/fsystem/fsflushbuffers.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsflushbuffers.c
rename to tools/prime-bundler/fsystem/fsflushbuffers.c
diff --git a/tools/prime-installer/fsystem/fsflushfatcache.c b/tools/prime-bundler/fsystem/fsflushfatcache.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsflushfatcache.c
rename to tools/prime-bundler/fsystem/fsflushfatcache.c
diff --git a/tools/prime-installer/fsystem/fsfreechain.c b/tools/prime-bundler/fsystem/fsfreechain.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfreechain.c
rename to tools/prime-bundler/fsystem/fsfreechain.c
diff --git a/tools/prime-installer/fsystem/fsfreefile.c b/tools/prime-bundler/fsystem/fsfreefile.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsfreefile.c
rename to tools/prime-bundler/fsystem/fsfreefile.c
diff --git a/tools/prime-installer/fsystem/fsgetaccessdate.c b/tools/prime-bundler/fsystem/fsgetaccessdate.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetaccessdate.c
rename to tools/prime-bundler/fsystem/fsgetaccessdate.c
diff --git a/tools/prime-installer/fsystem/fsgetchain.c b/tools/prime-bundler/fsystem/fsgetchain.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetchain.c
rename to tools/prime-bundler/fsystem/fsgetchain.c
diff --git a/tools/prime-installer/fsystem/fsgetchainsize.c b/tools/prime-bundler/fsystem/fsgetchainsize.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetchainsize.c
rename to tools/prime-bundler/fsystem/fsgetchainsize.c
diff --git a/tools/prime-installer/fsystem/fsgetcreattime.c b/tools/prime-bundler/fsystem/fsgetcreattime.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetcreattime.c
rename to tools/prime-bundler/fsystem/fsgetcreattime.c
diff --git a/tools/prime-installer/fsystem/fsgetcurrentvolume.c b/tools/prime-bundler/fsystem/fsgetcurrentvolume.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetcurrentvolume.c
rename to tools/prime-bundler/fsystem/fsgetcurrentvolume.c
diff --git a/tools/prime-installer/fsystem/fsgetcwd.c b/tools/prime-bundler/fsystem/fsgetcwd.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetcwd.c
rename to tools/prime-bundler/fsystem/fsgetcwd.c
diff --git a/tools/prime-installer/fsystem/fsgetdatetime.c b/tools/prime-bundler/fsystem/fsgetdatetime.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetdatetime.c
rename to tools/prime-bundler/fsystem/fsgetdatetime.c
diff --git a/tools/prime-installer/fsystem/fsgeterrormsg.c b/tools/prime-bundler/fsystem/fsgeterrormsg.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgeterrormsg.c
rename to tools/prime-bundler/fsystem/fsgeterrormsg.c
diff --git a/tools/prime-installer/fsystem/fsgetfilename.c b/tools/prime-bundler/fsystem/fsgetfilename.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetfilename.c
rename to tools/prime-bundler/fsystem/fsgetfilename.c
diff --git a/tools/prime-installer/fsystem/fsgethandle.c b/tools/prime-bundler/fsystem/fsgethandle.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgethandle.c
rename to tools/prime-bundler/fsystem/fsgethandle.c
diff --git a/tools/prime-installer/fsystem/fsgetnametype.c b/tools/prime-bundler/fsystem/fsgetnametype.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetnametype.c
rename to tools/prime-bundler/fsystem/fsgetnametype.c
diff --git a/tools/prime-installer/fsystem/fsgetnextentry.c b/tools/prime-bundler/fsystem/fsgetnextentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetnextentry.c
rename to tools/prime-bundler/fsystem/fsgetnextentry.c
diff --git a/tools/prime-installer/fsystem/fsgetvolumefree.c b/tools/prime-bundler/fsystem/fsgetvolumefree.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetvolumefree.c
rename to tools/prime-bundler/fsystem/fsgetvolumefree.c
diff --git a/tools/prime-installer/fsystem/fsgetvolumesize.c b/tools/prime-bundler/fsystem/fsgetvolumesize.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetvolumesize.c
rename to tools/prime-bundler/fsystem/fsgetvolumesize.c
diff --git a/tools/prime-installer/fsystem/fsgetwritetime.c b/tools/prime-bundler/fsystem/fsgetwritetime.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsgetwritetime.c
rename to tools/prime-bundler/fsystem/fsgetwritetime.c
diff --git a/tools/prime-installer/fsystem/fsinit.c b/tools/prime-bundler/fsystem/fsinit.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsinit.c
rename to tools/prime-bundler/fsystem/fsinit.c
diff --git a/tools/prime-installer/fsystem/fsmkdir.c b/tools/prime-bundler/fsystem/fsmkdir.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsmkdir.c
rename to tools/prime-bundler/fsystem/fsmkdir.c
diff --git a/tools/prime-installer/fsystem/fsmountvolume.c b/tools/prime-bundler/fsystem/fsmountvolume.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsmountvolume.c
rename to tools/prime-bundler/fsystem/fsmountvolume.c
diff --git a/tools/prime-installer/fsystem/fsmovedopenfiles.c b/tools/prime-bundler/fsystem/fsmovedopenfiles.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsmovedopenfiles.c
rename to tools/prime-bundler/fsystem/fsmovedopenfiles.c
diff --git a/tools/prime-installer/fsystem/fsnamecompare.c b/tools/prime-bundler/fsystem/fsnamecompare.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsnamecompare.c
rename to tools/prime-bundler/fsystem/fsnamecompare.c
diff --git a/tools/prime-installer/fsystem/fsopen.c b/tools/prime-bundler/fsystem/fsopen.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsopen.c
rename to tools/prime-bundler/fsystem/fsopen.c
diff --git a/tools/prime-installer/fsystem/fsopendir.c b/tools/prime-bundler/fsystem/fsopendir.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsopendir.c
rename to tools/prime-bundler/fsystem/fsopendir.c
diff --git a/tools/prime-installer/fsystem/fspackdir.c b/tools/prime-bundler/fsystem/fspackdir.c
similarity index 100%
rename from tools/prime-installer/fsystem/fspackdir.c
rename to tools/prime-bundler/fsystem/fspackdir.c
diff --git a/tools/prime-installer/fsystem/fspackname.c b/tools/prime-bundler/fsystem/fspackname.c
similarity index 100%
rename from tools/prime-installer/fsystem/fspackname.c
rename to tools/prime-bundler/fsystem/fspackname.c
diff --git a/tools/prime-installer/fsystem/fspatchfatblock.c b/tools/prime-bundler/fsystem/fspatchfatblock.c
similarity index 100%
rename from tools/prime-installer/fsystem/fspatchfatblock.c
rename to tools/prime-bundler/fsystem/fspatchfatblock.c
diff --git a/tools/prime-installer/fsystem/fsread.c b/tools/prime-bundler/fsystem/fsread.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsread.c
rename to tools/prime-bundler/fsystem/fsread.c
diff --git a/tools/prime-installer/fsystem/fsreadll.c b/tools/prime-bundler/fsystem/fsreadll.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsreadll.c
rename to tools/prime-bundler/fsystem/fsreadll.c
diff --git a/tools/prime-installer/fsystem/fsreleaseentry.c b/tools/prime-bundler/fsystem/fsreleaseentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsreleaseentry.c
rename to tools/prime-bundler/fsystem/fsreleaseentry.c
diff --git a/tools/prime-installer/fsystem/fsrename.c b/tools/prime-bundler/fsystem/fsrename.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsrename.c
rename to tools/prime-bundler/fsystem/fsrename.c
diff --git a/tools/prime-installer/fsystem/fsrestart.c b/tools/prime-bundler/fsystem/fsrestart.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsrestart.c
rename to tools/prime-bundler/fsystem/fsrestart.c
diff --git a/tools/prime-installer/fsystem/fsrmdir.c b/tools/prime-bundler/fsystem/fsrmdir.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsrmdir.c
rename to tools/prime-bundler/fsystem/fsrmdir.c
diff --git a/tools/prime-installer/fsystem/fsseek.c b/tools/prime-bundler/fsystem/fsseek.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsseek.c
rename to tools/prime-bundler/fsystem/fsseek.c
diff --git a/tools/prime-installer/fsystem/fssetcasemode.c b/tools/prime-bundler/fsystem/fssetcasemode.c
similarity index 100%
rename from tools/prime-installer/fsystem/fssetcasemode.c
rename to tools/prime-bundler/fsystem/fssetcasemode.c
diff --git a/tools/prime-installer/fsystem/fssetcurrentvolume.c b/tools/prime-bundler/fsystem/fssetcurrentvolume.c
similarity index 100%
rename from tools/prime-installer/fsystem/fssetcurrentvolume.c
rename to tools/prime-bundler/fsystem/fssetcurrentvolume.c
diff --git a/tools/prime-installer/fsystem/fsshutdown.c b/tools/prime-bundler/fsystem/fsshutdown.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsshutdown.c
rename to tools/prime-bundler/fsystem/fsshutdown.c
diff --git a/tools/prime-installer/fsystem/fssleep.c b/tools/prime-bundler/fsystem/fssleep.c
similarity index 100%
rename from tools/prime-installer/fsystem/fssleep.c
rename to tools/prime-bundler/fsystem/fssleep.c
diff --git a/tools/prime-installer/fsystem/fsstripsemi.c b/tools/prime-bundler/fsystem/fsstripsemi.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsstripsemi.c
rename to tools/prime-bundler/fsystem/fsstripsemi.c
diff --git a/tools/prime-installer/fsystem/fstell.c b/tools/prime-bundler/fsystem/fstell.c
similarity index 100%
rename from tools/prime-installer/fsystem/fstell.c
rename to tools/prime-bundler/fsystem/fstell.c
diff --git a/tools/prime-installer/fsystem/fstruncatechain.c b/tools/prime-bundler/fsystem/fstruncatechain.c
similarity index 100%
rename from tools/prime-installer/fsystem/fstruncatechain.c
rename to tools/prime-bundler/fsystem/fstruncatechain.c
diff --git a/tools/prime-installer/fsystem/fsupdatedirentry.c b/tools/prime-bundler/fsystem/fsupdatedirentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsupdatedirentry.c
rename to tools/prime-bundler/fsystem/fsupdatedirentry.c
diff --git a/tools/prime-installer/fsystem/fsvolumeinserted.c b/tools/prime-bundler/fsystem/fsvolumeinserted.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsvolumeinserted.c
rename to tools/prime-bundler/fsystem/fsvolumeinserted.c
diff --git a/tools/prime-installer/fsystem/fsvolumemounted.c b/tools/prime-bundler/fsystem/fsvolumemounted.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsvolumemounted.c
rename to tools/prime-bundler/fsystem/fsvolumemounted.c
diff --git a/tools/prime-installer/fsystem/fsvolumepresent.c b/tools/prime-bundler/fsystem/fsvolumepresent.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsvolumepresent.c
rename to tools/prime-bundler/fsystem/fsvolumepresent.c
diff --git a/tools/prime-installer/fsystem/fswrite.c b/tools/prime-bundler/fsystem/fswrite.c
similarity index 100%
rename from tools/prime-installer/fsystem/fswrite.c
rename to tools/prime-bundler/fsystem/fswrite.c
diff --git a/tools/prime-installer/fsystem/fswritefatentry.c b/tools/prime-bundler/fsystem/fswritefatentry.c
similarity index 100%
rename from tools/prime-installer/fsystem/fswritefatentry.c
rename to tools/prime-bundler/fsystem/fswritefatentry.c
diff --git a/tools/prime-installer/fsystem/fswritell.c b/tools/prime-bundler/fsystem/fswritell.c
similarity index 100%
rename from tools/prime-installer/fsystem/fswritell.c
rename to tools/prime-bundler/fsystem/fswritell.c
diff --git a/tools/prime-installer/fsystem/fsyspriv.h b/tools/prime-bundler/fsystem/fsyspriv.h
similarity index 100%
rename from tools/prime-installer/fsystem/fsyspriv.h
rename to tools/prime-bundler/fsystem/fsyspriv.h
diff --git a/tools/prime-installer/fsystem/fsystem.c b/tools/prime-bundler/fsystem/fsystem.c
similarity index 100%
rename from tools/prime-installer/fsystem/fsystem.c
rename to tools/prime-bundler/fsystem/fsystem.c
diff --git a/tools/prime-installer/fsystem/fsystem.h b/tools/prime-bundler/fsystem/fsystem.h
similarity index 100%
rename from tools/prime-installer/fsystem/fsystem.h
rename to tools/prime-bundler/fsystem/fsystem.h
diff --git a/tools/prime-installer/fsystem/misalign.c b/tools/prime-bundler/fsystem/misalign.c
similarity index 100%
rename from tools/prime-installer/fsystem/misalign.c
rename to tools/prime-bundler/fsystem/misalign.c
diff --git a/tools/prime-installer/installer-binaries.qrc b/tools/prime-bundler/installer-binaries.qrc
similarity index 100%
rename from tools/prime-installer/installer-binaries.qrc
rename to tools/prime-bundler/installer-binaries.qrc
diff --git a/tools/prime-installer/main.cpp b/tools/prime-bundler/main.cpp
similarity index 100%
rename from tools/prime-installer/main.cpp
rename to tools/prime-bundler/main.cpp
diff --git a/tools/prime-installer/maindialog.cpp b/tools/prime-bundler/maindialog.cpp
similarity index 100%
rename from tools/prime-installer/maindialog.cpp
rename to tools/prime-bundler/maindialog.cpp
diff --git a/tools/prime-installer/maindialog.h b/tools/prime-bundler/maindialog.h
similarity index 100%
rename from tools/prime-installer/maindialog.h
rename to tools/prime-bundler/maindialog.h
diff --git a/tools/prime-installer/maindialog.ui b/tools/prime-bundler/maindialog.ui
similarity index 100%
rename from tools/prime-installer/maindialog.ui
rename to tools/prime-bundler/maindialog.ui
diff --git a/tools/prime-installer/prime-installer.pro b/tools/prime-bundler/prime-bundler.pro
similarity index 98%
rename from tools/prime-installer/prime-installer.pro
rename to tools/prime-bundler/prime-bundler.pro
index 635487a..34baa3c 100644
--- a/tools/prime-installer/prime-installer.pro
+++ b/tools/prime-bundler/prime-bundler.pro
@@ -122,4 +122,4 @@ DISTFILES += \
     thirdparty/LICENSE.md5
 
 # Set application icon for the windows applications - this is target-specific
-win32: RC_ICONS = ../../../bitmap/newRPL.ico
+win32: RC_ICONS = ../../bitmap/newRPL.ico
diff --git a/tools/prime-installer/sddriver.c b/tools/prime-bundler/sddriver.c
similarity index 100%
rename from tools/prime-installer/sddriver.c
rename to tools/prime-bundler/sddriver.c
diff --git a/tools/prime-installer/sddriver.h b/tools/prime-bundler/sddriver.h
similarity index 100%
rename from tools/prime-installer/sddriver.h
rename to tools/prime-bundler/sddriver.h
diff --git a/tools/prime-installer/stdlib.c b/tools/prime-bundler/stdlib.c
similarity index 100%
rename from tools/prime-installer/stdlib.c
rename to tools/prime-bundler/stdlib.c
diff --git a/tools/prime-installer/thirdparty/LICENSE.md5 b/tools/prime-bundler/thirdparty/LICENSE.md5
similarity index 100%
rename from tools/prime-installer/thirdparty/LICENSE.md5
rename to tools/prime-bundler/thirdparty/LICENSE.md5
diff --git a/tools/prime-installer/thirdparty/global.h b/tools/prime-bundler/thirdparty/global.h
similarity index 100%
rename from tools/prime-installer/thirdparty/global.h
rename to tools/prime-bundler/thirdparty/global.h
diff --git a/tools/prime-installer/thirdparty/md5.h b/tools/prime-bundler/thirdparty/md5.h
similarity index 100%
rename from tools/prime-installer/thirdparty/md5.h
rename to tools/prime-bundler/thirdparty/md5.h
diff --git a/tools/prime-installer/thirdparty/md5c.c b/tools/prime-bundler/thirdparty/md5c.c
similarity index 100%
rename from tools/prime-installer/thirdparty/md5c.c
rename to tools/prime-bundler/thirdparty/md5c.c
diff --git a/tools/prime-installer/utf8data.c b/tools/prime-bundler/utf8data.c
similarity index 100%
rename from tools/prime-installer/utf8data.c
rename to tools/prime-bundler/utf8data.c
diff --git a/tools/prime-installer/utf8lib.c b/tools/prime-bundler/utf8lib.c
similarity index 100%
rename from tools/prime-installer/utf8lib.c
rename to tools/prime-bundler/utf8lib.c
diff --git a/tools/prime-installer/utf8lib.h b/tools/prime-bundler/utf8lib.h
similarity index 100%
rename from tools/prime-installer/utf8lib.h
rename to tools/prime-bundler/utf8lib.h
diff --git a/tools/windows-installer/newRPL-Desktop.iss b/tools/windows-installer/newRPL-Desktop.iss
index f6411a8..8e025b0 100644
--- a/tools/windows-installer/newRPL-Desktop.iss
+++ b/tools/windows-installer/newRPL-Desktop.iss
@@ -11,6 +11,7 @@ OutputBaseFilename=newRPL Desktop Installer
 SourceDir=userdocs:deploy-newRPL-Desktop
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
+LicenseFile=license\LICENSE.txt
 
 [Types]
 Name: "full"; Description: "Full installation"
@@ -47,6 +48,7 @@ Source: "sample themes\Color_Theme_AmberCRT.nrpl"; DestDir: "{autodocs}\newRPL F
 Source: "sample themes\Color_Theme_Default.nrpl"; DestDir: "{autodocs}\newRPL Files\Sample Themes"; Components: "desktopprime\samplethemes"
 Source: "sample themes\Color_Theme_GreenCRT.nrpl"; DestDir: "{autodocs}\newRPL Files\Sample Themes"; Components: "desktopprime\samplethemes"
 Source: "sample themes\Color_Theme_Red.nrpl"; DestDir: "{autodocs}\newRPL Files\Sample Themes"; Components: "desktopprime\samplethemes"
+Source: "license\LICENSE.txt"; DestDir: "{app}"; Components: desktopprime desktop50g primeinstaller