diff --git a/Makefile b/Makefile
index c6ef9e96..a58172b7 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ ifneq ($(filter aarch%,$(UNAME_M)),)
 	TAR_ARCH := aarch64
 endif
 
-APT_RPM_BUILD_DIR = $(PWD)/apt-rpm/builddir
+APT_RPM_BUILD_DIR = $(PWD)/apt-rpm-core/builddir
 RPM_BUILD_DIR = $(PWD)/rpm/builddir
 EXE_BUILD_DIR = exe
 
@@ -43,12 +43,13 @@ APT_RPM_PACKAGE_DIR = $(APT_RPM_BUILD_DIR)/RPMS/$(RPM_ARCH)
 RPM_PACKAGE_DIR = $(RPM_BUILD_DIR)/RPMS/$(RPM_ARCH)
 TAR_PACKAGE_DIR = $(PWD)
 
-APT_RPM = $(APT_RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(APT_RPM_RELEASE_SUFFIX).$(RPM_ARCH).rpm
+APT_RPM_CORE = $(APT_RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(APT_RPM_RELEASE_SUFFIX).$(RPM_ARCH).rpm
 RPM = $(RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(RPM_RELEASE_SUFFIX).$(RPM_ARCH).rpm
 DEB = deb/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH)$(DEB_RELEASE_SUFFIX).deb
 EXE = $(EXE_BUILD_DIR)/$(COMPANY_NAME)-$(PRODUCT_NAME)-$(PRODUCT_VERSION).$(BUILD_NUMBER)-x64.exe
 TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(TAR_RELEASE_SUFFIX)-$(TAR_ARCH).tar.gz
 
+
 PACKAGE_SERVICES ?= ds-docservice ds-converter ds-metrics
 
 DOCUMENTSERVER = common/documentserver/home
@@ -134,7 +135,7 @@ else
 		SHELL_EXT := .sh
 		ARCH_EXT := .zip
 		AR := 7z a -y
-		PACKAGES = deb rpm tar apt-rpm
+		PACKAGES = deb rpm tar apt-rpm-core
 		DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
 		NGINX_CONF := /etc/nginx/includes
 		NGINX_LOG := /var/log/$(DS_PREFIX)
@@ -231,16 +232,16 @@ endif
 LINUX_DEPS_CLEAN += common/documentserver/bin/*.sh
 
 LINUX_DEPS += rpm/$(PACKAGE_NAME).spec
-LINUX_DEPS += apt-rpm/$(PACKAGE_NAME).spec
+LINUX_DEPS += apt-rpm-core/$(PACKAGE_NAME).spec
 
 LINUX_DEPS_CLEAN += rpm/$(PACKAGE_NAME).spec
-LINUX_DEPS_CLEAN += apt-rpm/$(PACKAGE_NAME).spec
+LINUX_DEPS_CLEAN += apt-rpm-core/$(PACKAGE_NAME).spec
 
 LINUX_DEPS += rpm/bin/documentserver-configure.sh
-LINUX_DEPS += apt-rpm/bin/documentserver-configure.sh
+LINUX_DEPS += apt-rpm-core/bin/documentserver-configure.sh
 
 LINUX_DEPS_CLEAN += rpm/bin/*.sh
-LINUX_DEPS_CLEAN += apt-rpm/bin/*.sh
+LINUX_DEPS_CLEAN += apt-rpm-core/bin/*.sh
 
 WIN_DEPS += exe/$(PACKAGE_NAME).iss
 
@@ -273,9 +274,9 @@ M4_PARAMS += -D M4_PACKAGE_SERVICES='$(PACKAGE_SERVICES)'
 
 .PHONY: all clean clean-docker rpm deb packages deploy-bin
 
-all: rpm deb apt-rpm
+all: rpm deb apt-rpm-core
 
-apt-rpm:$(APT_RPM)
+apt-rpm-core:$(APT_RPM_CORE)
 
 rpm: $(RPM)
 
@@ -407,10 +408,10 @@ documentserver-example:
 
 	echo "Done" > $@
 
-apt-rpm/$(PACKAGE_NAME).spec : apt-rpm/package.spec
+apt-rpm-core/$(PACKAGE_NAME).spec : apt-rpm-core/package.spec
 	mv -f $< $@
 
-$(APT_RPM): $(COMMON_DEPS) $(LINUX_DEPS) documentserver documentserver-example
+$(APT_RPM_CORE): $(COMMON_DEPS) $(LINUX_DEPS) documentserver
 	mkdir -p $(@D)
 	cd $(@D)/../../.. && rpmbuild \
 		-bb \
diff --git a/apt-rpm/bin/documentserver-configure.sh.m4 b/apt-rpm-core/bin/documentserver-configure.sh.m4
similarity index 100%
rename from apt-rpm/bin/documentserver-configure.sh.m4
rename to apt-rpm-core/bin/documentserver-configure.sh.m4
diff --git a/apt-rpm/package.spec.m4 b/apt-rpm-core/package.spec.m4
similarity index 72%
rename from apt-rpm/package.spec.m4
rename to apt-rpm-core/package.spec.m4
index 5c89a0a2..6016d134 100644
--- a/apt-rpm/package.spec.m4
+++ b/apt-rpm-core/package.spec.m4
@@ -1,8 +1,6 @@
 include(variables.m4)
 License: AGPL
 
-ifelse('M4_DS_EXAMPLE_ENABLE', '1',
-%define example 1,)
 %define _package_summary defn(`RPM[Summary]')
 %define _package_description defn(`RPM[Description]')
 
@@ -10,4 +8,4 @@ ifelse('M4_DS_EXAMPLE_ENABLE', '1',
 
 %include requires.spec
 %include vars.spec
-%include ../rpm/common.spec
+%include ../rpm-core/common.spec
diff --git a/apt-rpm/requires.spec b/apt-rpm-core/requires.spec
similarity index 100%
rename from apt-rpm/requires.spec
rename to apt-rpm-core/requires.spec
diff --git a/apt-rpm/vars.spec b/apt-rpm-core/vars.spec
similarity index 100%
rename from apt-rpm/vars.spec
rename to apt-rpm-core/vars.spec