diff --git a/src/zabapgit_page_background.prog.abap b/src/zabapgit_page_background.prog.abap
index 48c494952..7db1f504f 100644
--- a/src/zabapgit_page_background.prog.abap
+++ b/src/zabapgit_page_background.prog.abap
@@ -120,7 +120,7 @@ CLASS lcl_gui_page_bkg IMPLEMENTATION.
       WHEN zif_abapgit_definitions=>gc_action-bg_update.
         ls_bg_task     = zcl_abapgit_html_action_utils=>decode_bg_update( iv_getdata ).
         ls_bg_task-key = mv_key.
-        lcl_services_bkg=>update_task( ls_bg_task ).
+        zcl_abapgit_services_bkg=>update_task( ls_bg_task ).
         ev_state = zif_abapgit_definitions=>gc_event_state-re_render.
     ENDCASE.
 
diff --git a/src/zabapgit_services.prog.abap b/src/zabapgit_services.prog.abap
index 257e84d62..8231bcdf1 100644
--- a/src/zabapgit_services.prog.abap
+++ b/src/zabapgit_services.prog.abap
@@ -6,4 +6,3 @@ INCLUDE zabapgit_services_git.
 INCLUDE zabapgit_services_repo.
 INCLUDE zabapgit_services_abapgit.
 INCLUDE zabapgit_services_db.
-INCLUDE zabapgit_services_background.
diff --git a/src/zabapgit_services_background.prog.xml b/src/zabapgit_services_background.prog.xml
deleted file mode 100644
index 1a6276ed2..000000000
--- a/src/zabapgit_services_background.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PROGDIR>
-    <NAME>ZABAPGIT_SERVICES_BACKGROUND</NAME>
-    <STATE>A</STATE>
-    <VARCL>X</VARCL>
-    <SUBC>I</SUBC>
-    <RLOAD>E</RLOAD>
-    <UCCHECK>X</UCCHECK>
-   </PROGDIR>
-   <TPOOL>
-    <item>
-     <ID>R</ID>
-     <ENTRY>Include ZABAPGIT_SERVICES_BACKGROUND</ENTRY>
-     <LENGTH>36</LENGTH>
-    </item>
-   </TPOOL>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/zabapgit_services_background.prog.abap b/src/zcl_abapgit_services_bkg.clas.abap
similarity index 59%
rename from src/zabapgit_services_background.prog.abap
rename to src/zcl_abapgit_services_bkg.clas.abap
index 9cd0f5d56..2cae2a76a 100644
--- a/src/zabapgit_services_background.prog.abap
+++ b/src/zcl_abapgit_services_bkg.clas.abap
@@ -1,8 +1,4 @@
-*&---------------------------------------------------------------------*
-*&  Include           ZABAPGIT_SERVICES_BACKGROUND
-*&---------------------------------------------------------------------*
-
-CLASS lcl_services_bkg DEFINITION FINAL.
+CLASS zcl_abapgit_services_bkg DEFINITION PUBLIC FINAL CREATE PUBLIC.
 
   PUBLIC SECTION.
 
@@ -10,9 +6,12 @@ CLASS lcl_services_bkg DEFINITION FINAL.
       IMPORTING is_bg_task TYPE zcl_abapgit_persist_background=>ty_background
       RAISING   zcx_abapgit_exception.
 
-ENDCLASS. "lcl_services_background
+ENDCLASS.
+
+
+
+CLASS ZCL_ABAPGIT_SERVICES_BKG IMPLEMENTATION.
 
-CLASS lcl_services_bkg IMPLEMENTATION.
 
   METHOD update_task.
 
@@ -30,6 +29,5 @@ CLASS lcl_services_bkg IMPLEMENTATION.
 
     COMMIT WORK.
 
-  ENDMETHOD.  "update_task
-
-ENDCLASS. "lcl_services_background
+  ENDMETHOD.
+ENDCLASS.
diff --git a/src/zcl_abapgit_services_bkg.clas.xml b/src/zcl_abapgit_services_bkg.clas.xml
new file mode 100644
index 000000000..6decc1324
--- /dev/null
+++ b/src/zcl_abapgit_services_bkg.clas.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_SERVICES_BKG</CLSNAME>
+    <VERSION>1</VERSION>
+    <LANGU>E</LANGU>
+    <DESCRIPT>Background services</DESCRIPT>
+    <EXPOSURE>2</EXPOSURE>
+    <STATE>1</STATE>
+    <CLSFINAL>X</CLSFINAL>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>