diff --git a/configure/modules/DEFINES_FT b/configure/modules/DEFINES_FT
index 908d65ed2cfd9a26870d39aeaa65b4a92b298316..e1a42e1b73eddd737946ddee23e030937d82a9ac 100644
--- a/configure/modules/DEFINES_FT
+++ b/configure/modules/DEFINES_FT
@@ -15,7 +15,7 @@ git submodule update --remote --merge $@/
 endef
 
 define patch_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)-*.p0.patch 2> /dev/null); \
+patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)/*.p0.patch 2> /dev/null); \
 if [ -n "$$patches" ]; then \
   for i in $$patches; do \
     printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
@@ -27,7 +27,7 @@ fi
 endef
 
 define patch_revert_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch 2> /dev/null); \
+patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)/*.p0.patch 2> /dev/null); \
 if [ -n "$$patches" ]; then \
   for i in $$patches; do\
     printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
diff --git a/patch/Site/3.0.4-tclsh-path-for-readOnlyFS.p0.patch b/patch/Site/3.0.4-tclsh-path-for-readOnlyFS.p0.patch
deleted file mode 100644
index a89d7e1d2c99b014ec77b08f7d45e11bf2632fcc..0000000000000000000000000000000000000000
--- a/patch/Site/3.0.4-tclsh-path-for-readOnlyFS.p0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git App/tools/expandDBD.tcl App/tools/expandDBD.tcl
-index 0539876..747208b 100755
---- App/tools/expandDBD.tcl
-+++ App/tools/expandDBD.tcl
-@@ -1,4 +1,6 @@
--#!/usr/bin/tclsh
-+#!/bin/sh
-+# the next line restarts using tclsh \
-+exec tclsh "$0" "$@"
- 
- package require Tclx
- 
diff --git a/patch/Site/3.0.5-tclsh-path-for-readOnlyFS.p0.patch b/patch/Site/3.0.5-tclsh-path-for-readOnlyFS.p0.patch
deleted file mode 100644
index a89d7e1d2c99b014ec77b08f7d45e11bf2632fcc..0000000000000000000000000000000000000000
--- a/patch/Site/3.0.5-tclsh-path-for-readOnlyFS.p0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git App/tools/expandDBD.tcl App/tools/expandDBD.tcl
-index 0539876..747208b 100755
---- App/tools/expandDBD.tcl
-+++ App/tools/expandDBD.tcl
-@@ -1,4 +1,6 @@
--#!/usr/bin/tclsh
-+#!/bin/sh
-+# the next line restarts using tclsh \
-+exec tclsh "$0" "$@"
- 
- package require Tclx
- 
diff --git a/patch/Site/HISTORY.md b/patch/Site/HISTORY.md
deleted file mode 100644
index cbaad2eaa64047b0bd0ec3c4be818540a470da74..0000000000000000000000000000000000000000
--- a/patch/Site/HISTORY.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# what_ever_filename.p0.patch
-
-Generic Description.....
-
-* created by Jeong Han Lee, han.lee@esss.se
-* related URL or reference https://github.com/icshwi
-* Tuesday, February 13 13:24:57 CET 2018
diff --git a/patch/Site/README.md b/patch/Site/README.md
deleted file mode 100644
index 60cb9573d1395655dd6fc3dc93eb663db8091568..0000000000000000000000000000000000000000
--- a/patch/Site/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Site Specific EPICS Module Patch Files
-
-## Changes
-The changes were tested in local environemnt, and commits to the forked repository and do pull request to the epics community module repository.
-
-* Check the original HASH, and your own master
-* feb8856 : The original HASH
-* master : Changed
-
-
-## How to create a p0 patch file between commits
-
-
-* Show what the difference between commits
-
-
-* Create p0 patch
-
-```
-$git diff feb8856 master --no-prefix > ../patch/Site/what_ever_filename.p0.patch
-```
-