diff --git a/Makefile b/Makefile
index 40cb2cd..9c278a9 100644
--- a/Makefile
+++ b/Makefile
@@ -198,16 +198,6 @@ private_build: assert_PKG_arg_must_be_specified
 		--packages-up-to ${PKG}
 
 
-new: assert_PKG_arg_must_be_specified
-	mkdir -p "${WORKSPACE_SRC}"
-	cp -R ${CCWS_DIR}/pkg_template/catkin "${WORKSPACE_SRC}/${PKG}"
-	mkdir -p "${WORKSPACE_SRC}/${PKG}/include/${PKG}"
-	cd "${WORKSPACE_SRC}/${PKG}"; git init
-	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@PACKAGE@@/${PKG}/g"
-	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@AUTHOR@@/${AUTHOR}/g"
-	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@EMAIL@@/${EMAIL}/g"
-	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@LICENSE@@/${LICENSE}/g"
-
 add:
 	test -f "${WORKSPACE_SRC}/.${REPO_LIST_FORMAT}" || ${MAKE} wsinit
 	bash -c "\
diff --git a/ccws/examples/pkg_ament/CMakeLists.txt b/ccws/examples/pkg_ament/CMakeLists.txt
new file mode 100644
index 0000000..4c9f79e
--- /dev/null
+++ b/ccws/examples/pkg_ament/CMakeLists.txt
@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.16)
+project(@@PACKAGE@@)
+
+#if(CCWS_CLANG_TIDY)
+#    set(CMAKE_CXX_CLANG_TIDY "${CCWS_CLANG_TIDY}" CACHE STRING "" FORCE)
+#endif()
+#if(CCWS_CXX_FLAGS)
+#    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CCWS_CXX_FLAGS}")
+#    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CCWS_LINKER_FLAGS}")
+#else()
+#    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+#    set(CMAKE_VERBOSE_MAKEFILE ON)
+#
+#    if(NOT CMAKE_CXX_STANDARD)
+#        set(CMAKE_CXX_STANDARD 17)
+#        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+#    endif()
+#
+#    if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+#        add_compile_options(-Wall -Wextra -Wpedantic -Werror)
+#    endif()
+#endif()
+
+
+# find dependencies
+find_package(ament_cmake REQUIRED)
+# uncomment the following section in order to fill in
+# further dependencies manually.
+# find_package(<dependency> REQUIRED)
+
+
+if(BUILD_TESTING)
+    find_package(ament_lint_auto REQUIRED)
+    # the following line skips the linter which checks for copyrights
+    # comment the line when a copyright and license is added to all source files
+    set(ament_cmake_copyright_FOUND TRUE)
+    # the following line skips cpplint (only works in a git repo)
+    # comment the line when this package is in a git repo and when
+    # a copyright and license is added to all source files
+    set(ament_cmake_cpplint_FOUND TRUE)
+    ament_lint_auto_find_test_dependencies()
+endif()
+
+ament_package()
diff --git a/ccws/pkg_template/catkin/README.md b/ccws/examples/pkg_ament/README.md
similarity index 100%
rename from ccws/pkg_template/catkin/README.md
rename to ccws/examples/pkg_ament/README.md
diff --git a/ccws/examples/pkg_ament/package.xml b/ccws/examples/pkg_ament/package.xml
new file mode 100644
index 0000000..6ae7192
--- /dev/null
+++ b/ccws/examples/pkg_ament/package.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+    <name>@@PACKAGE@@</name>
+    <version>0.1.0</version>
+    <description>The @@PACKAGE@@ package</description>
+    <maintainer email="@@EMAIL@@">@@AUTHOR@@</maintainer>
+    <license>@@LICENSE@@</license>
+
+    <buildtool_depend>ament_cmake</buildtool_depend>
+
+    <test_depend>ament_lint_auto</test_depend>
+    <test_depend>ament_lint_common</test_depend>
+
+    <export>
+        <build_type>ament_cmake</build_type>
+    </export>
+</package>
diff --git a/ccws/pkg_template/catkin/CMakeLists.txt b/ccws/examples/pkg_catkin/CMakeLists.txt
similarity index 100%
rename from ccws/pkg_template/catkin/CMakeLists.txt
rename to ccws/examples/pkg_catkin/CMakeLists.txt
diff --git a/ccws/examples/pkg_catkin/README.md b/ccws/examples/pkg_catkin/README.md
new file mode 100644
index 0000000..6cccfbd
--- /dev/null
+++ b/ccws/examples/pkg_catkin/README.md
@@ -0,0 +1 @@
+@@PACKAGE@@
diff --git a/ccws/pkg_template/catkin/launch/bringup.launch b/ccws/examples/pkg_catkin/launch/bringup.launch
similarity index 100%
rename from ccws/pkg_template/catkin/launch/bringup.launch
rename to ccws/examples/pkg_catkin/launch/bringup.launch
diff --git a/ccws/pkg_template/catkin/package.xml b/ccws/examples/pkg_catkin/package.xml
similarity index 100%
rename from ccws/pkg_template/catkin/package.xml
rename to ccws/examples/pkg_catkin/package.xml
diff --git a/ccws/pkg_template/catkin/test/CMakeLists.txt b/ccws/examples/pkg_catkin/test/CMakeLists.txt
similarity index 100%
rename from ccws/pkg_template/catkin/test/CMakeLists.txt
rename to ccws/examples/pkg_catkin/test/CMakeLists.txt
diff --git a/ccws/pkg_template/catkin/test/demo_gtest.cpp b/ccws/examples/pkg_catkin/test/demo_gtest.cpp
similarity index 100%
rename from ccws/pkg_template/catkin/test/demo_gtest.cpp
rename to ccws/examples/pkg_catkin/test/demo_gtest.cpp
diff --git a/ccws/pkg_template/catkin/test/demo_rostest.cpp b/ccws/examples/pkg_catkin/test/demo_rostest.cpp
similarity index 100%
rename from ccws/pkg_template/catkin/test/demo_rostest.cpp
rename to ccws/examples/pkg_catkin/test/demo_rostest.cpp
diff --git a/ccws/pkg_template/catkin/test/demo_rostest.test b/ccws/examples/pkg_catkin/test/demo_rostest.test
similarity index 100%
rename from ccws/pkg_template/catkin/test/demo_rostest.test
rename to ccws/examples/pkg_catkin/test/demo_rostest.test
diff --git a/ccws/pkg_template/catkin/test/demo_rostest_parametrized.test b/ccws/examples/pkg_catkin/test/demo_rostest_parametrized.test
similarity index 100%
rename from ccws/pkg_template/catkin/test/demo_rostest_parametrized.test
rename to ccws/examples/pkg_catkin/test/demo_rostest_parametrized.test
diff --git a/ccws/make/new.mk b/ccws/make/new.mk
new file mode 100644
index 0000000..19fdd6e
--- /dev/null
+++ b/ccws/make/new.mk
@@ -0,0 +1,19 @@
+new: assert_PKG_arg_must_be_specified
+	mkdir -p "${WORKSPACE_SRC}"
+	${MAKE} new_${OS_DISTRO_BUILD}
+	mkdir -p "${WORKSPACE_SRC}/${PKG}/include/${PKG}"
+	cd "${WORKSPACE_SRC}/${PKG}"; git init
+	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@PACKAGE@@/${PKG}/g"
+	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@AUTHOR@@/${AUTHOR}/g"
+	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@EMAIL@@/${EMAIL}/g"
+	find "${WORKSPACE_SRC}/${PKG}" -type f | xargs sed -i "s/@@LICENSE@@/${LICENSE}/g"
+
+new_bionic: new_focal
+	# passthrough
+
+new_focal:
+	cp -R ${CCWS_DIR}/examples/pkg_catkin "${WORKSPACE_SRC}/${PKG}"
+
+new_jammy:
+	cp -R ${CCWS_DIR}/examples/pkg_ament "${WORKSPACE_SRC}/${PKG}"
+