diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yaml
similarity index 100%
rename from .github/workflows/ci-cd.yml
rename to .github/workflows/ci-cd.yaml
diff --git a/.lycheeignore b/.lycheeignore
index d21b19d4..5c810ead 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -4,4 +4,4 @@ https://uel.java.net/
 https://www.openapis.org/
 https://jcp.org/*
 http://localhost:8080/*
-https://github.com/QubitPi/fast-ws/blob/master/FastWS-Project-intellij-code-style.xml
+https://*/ci-cd.yaml
diff --git a/README.md b/README.md
index 2bf1a997..5d615fff 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ FastWS
 ======
 
 ![Java Version Badge][Java Version Badge]
-[![GitHub Workflow Status][GitHub Workflow Status]](https://github.com/QubitPi/fast-ws/actions/workflows/ci-cd.yml)
+[![GitHub Workflow Status][GitHub Workflow Status]](https://github.com/QubitPi/fast-ws/actions/workflows/ci-cd.yaml)
 [![Apache License Badge]][Apache License, Version 2.0]
 
 __FastWS__ is a [JSR 370] webservice template that lets us spin up Java webservice quickly through [GitHub templates].
@@ -69,7 +69,7 @@ The use and distribution terms for [fast-ws]() are covered by the [Apache Licens
 [Documentation]: https://fastws.qubitpi.org/
 
 [GitHub templates]: https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-template-repository#about-template-repositories
-[GitHub Workflow Status]: https://img.shields.io/github/actions/workflow/status/QubitPi/fast-ws/ci-cd.yml?branch=master&logo=github&style=for-the-badge
+[GitHub Workflow Status]: https://img.shields.io/github/actions/workflow/status/QubitPi/fast-ws/ci-cd.yaml?branch=master&logo=github&style=for-the-badge
 
 [Java Version Badge]: https://img.shields.io/badge/Java-17-brightgreen?style=for-the-badge&logo=OpenJDK&logoColor=white
 [fast-ws]: https://fastws.qubitpi.org/
diff --git a/docs/README.md b/docs/README.md
index f43bc6e3..2fd298a6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -34,7 +34,7 @@ service.
 
 #### Docusaurus Blogs Relative Linking is Treated False-Negative by CI Markdown Link check
 
-[CI check for Markdown link](../.github/workflows/ci-cd.yml) (`markdown-link-check`) is turned on and it's not smart
+[CI check for Markdown link](../.github/workflows/ci-cd.yaml) (`markdown-link-check`) is turned on and it's not smart
 enough to detect relative linking by Docusaurus. The workaround is to disable the link check at the relevant line. For
 example:
 
diff --git a/docs/docs/development.md b/docs/docs/development.md
index 64c943b5..f581ea9b 100644
--- a/docs/docs/development.md
+++ b/docs/docs/development.md
@@ -253,7 +253,7 @@ If tabs still come out at 2 spaces when hitting TAB or Enter, not 4 spaces, try:
    ("Settings | Editor | Code Style") have priority (will overwrite) over your IDE settings.
 
 [Docker]: https://github.com/QubitPi/fast-ws/blob/master/Dockerfile
-[Docker-based integration tests]: https://github.com/QubitPi/fast-ws/blob/master/src/test/groovy/com/qubitpi/ws/jersey/template/DockerITSpec.groovy
+[Docker-based integration tests]: https://github.com/QubitPi/fast-ws/blob/master/src/test/groovy/com/qubitpi/fastws/DockerITSpec.groovy
 
 [jcabi-mysql]: https://mysql.jcabi.com/
 [fast-ws Dockerfile]: https://github.com/QubitPi/fast-ws/blob/master/Dockerfile
diff --git a/src/main/java/com/qubitpi/fastws/application/ResourceConfig.java b/src/main/java/com/qubitpi/fastws/application/ResourceConfig.java
index f9edad35..6b743586 100644
--- a/src/main/java/com/qubitpi/fastws/application/ResourceConfig.java
+++ b/src/main/java/com/qubitpi/fastws/application/ResourceConfig.java
@@ -15,6 +15,7 @@
  */
 package com.qubitpi.fastws.application;
 
+import com.qubitpi.fastws.web.endpoints.DataServlet;
 import com.qubitpi.fastws.web.filters.CorsFilter;
 
 import org.glassfish.hk2.utilities.Binder;
@@ -32,7 +33,7 @@
 @ApplicationPath("v1")
 public class ResourceConfig extends org.glassfish.jersey.server.ResourceConfig {
 
-    private static final String ENDPOINT_PACKAGE = "com.qubitpi.fastws.web.endpoints";
+    private static final String ENDPOINT_PACKAGE = DataServlet.class.getPackage().getName();
 
     /**
      * DI Constructor that allows for finer dependency injection control.
diff --git a/src/test/groovy/com/qubitpi/fastws/JettyServerFactorySpec.groovy b/src/test/groovy/com/qubitpi/fastws/JettyServerFactorySpec.groovy
index 333358ba..46458614 100755
--- a/src/test/groovy/com/qubitpi/fastws/JettyServerFactorySpec.groovy
+++ b/src/test/groovy/com/qubitpi/fastws/JettyServerFactorySpec.groovy
@@ -15,6 +15,8 @@
  */
 package com.qubitpi.fastws
 
+import com.qubitpi.fastws.resource.TestEndpoint
+
 import org.eclipse.jetty.server.Server
 import org.glassfish.jersey.server.ResourceConfig
 
@@ -26,7 +28,7 @@ import spock.lang.Specification
 class JettyServerFactorySpec extends Specification {
 
     static final int PORT = 8080
-    static final String ENDPOINT_RESOURCE_PACKAGE = "com.qubitpi.fastws.resource"
+    static final String ENDPOINT_RESOURCE_PACKAGE = TestEndpoint.class.getPackage().getName()
 
     /**
      * DI constructor.