diff --git a/src/Db/.keep b/src/Db/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Db/ecmcPluginScope.template b/src/Db/ecmcPluginScope.template
deleted file mode 100644
index 096487e..0000000
--- a/src/Db/ecmcPluginScope.template
+++ /dev/null
@@ -1,90 +0,0 @@
-# Data source
-record(waveform,"$(P)Plugin-Scope${INDEX}-DataSource"){
-  field(DESC, "Data source name")
-  field(PINI, "1")
-  field(DTYP, "asynInt8ArrayIn")
-  field(INP,  "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt8ArrayIn/plugin.scope${INDEX}.source?")
-  field(FTVL, "CHAR")
-  field(NELM, "1024")
-  field(SCAN, "I/O Intr")
-  field(TSE,  "0")  
-}
-
-record(waveform,"$(P)Plugin-Scope${INDEX}-TriggSource"){
-  field(DESC, "Trigger source name")
-  field(PINI, "1")
-  field(DTYP, "asynInt8ArrayIn")
-  field(INP,  "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt8ArrayIn/plugin.scope${INDEX}.trigg?")
-  field(FTVL, "CHAR")
-  field(NELM, "1024")
-  field(SCAN, "I/O Intr")
-  field(TSE,  "0")  
-}
-
-record(waveform,"$(P)Plugin-Scope${INDEX}-NextTimeSource"){
-  field(DESC, "Trigger source name")
-  field(PINI, "1")
-  field(DTYP, "asynInt8ArrayIn")
-  field(INP,  "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt8ArrayIn/plugin.scope${INDEX}.nexttime?")
-  field(FTVL, "CHAR")
-  field(NELM, "1024")
-  field(SCAN, "I/O Intr")
-  field(TSE,  "0")  
-}
-
-# result
-record(waveform,"$(P)Plugin-Scope${INDEX}-Data-Act"){
-  info(asyn:FIFO, "1000")
-  field(DESC, "Result data")
-  field(PINI, "1")
-  field(DTYP, "${RESULT_DTYP}")
-  field(INP,  "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=-1)/TYPE=${RESULT_DTYP}/plugin.scope${INDEX}.resultdata?")
-  field(FTVL, "${RESULT_FTVL}")
-  field(NELM, "${RESULT_NELM}")
-  field(SCAN, "I/O Intr")
-  field(TSE,  "0")
-}
-
-record(bo,"$(P)Plugin-Scope${INDEX}-Enable"){
-  field(DESC, "FFT Enable")
-  field(DTYP,"asynInt32")
-  field(OUT, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/plugin.scope${INDEX}.enable=")
-  field(ZNAM,"FALSE")
-  field(ONAM,"TRUE")
-  field(DOL, "0")
-  field(VAL, "0")
-}
-
-record(ai,"$(P)Plugin-Scope${INDEX}-MissTriggCntAct"){
-  field(PINI, "1")
-  field(DESC, "Missed trigger counter")
-  field(DTYP,"asynInt32")
-  field(INP, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/plugin.scope${INDEX}.missed?")
-  field(SCAN, "I/O Intr")
-}
-
-record(ai,"$(P)Plugin-Scope${INDEX}-ScanToTriggSamples"){
-  field(PINI, "1")
-  field(DESC, "Samples between now and trigger []")
-  field(DTYP,"asynFloat64")
-  field(INP, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynFloat64/plugin.scope${INDEX}.scantotrigg?")
-  field(SCAN, "I/O Intr")
-}
-
-record(ai,"$(P)Plugin-Scope${INDEX}-TriggCntAct"){
-  field(PINI, "1")
-  field(DESC, "Trigger counter")
-  field(DTYP,"asynInt32")
-  field(INP, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/plugin.scope${INDEX}.count?")
-  field(SCAN, "I/O Intr")
-}
-
-#record(bo,"$(P)Plugin-Scope${INDEX}-Trigg"){
-#  field(DESC, "FFT Trigg measurement")
-#  field(DTYP,"asynInt32")
-#  field(OUT, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/plugin.scope${INDEX}.trigg")
-#  field(ZNAM,"FALSE")
-#  field(ONAM,"TRUE")
-#  field(DOL, "0")
-#  field(VAL, "0")
-#}
diff --git a/src/src/ecmcDAQChannel.cpp b/src/ecmcDAQChannel.cpp
similarity index 100%
rename from src/src/ecmcDAQChannel.cpp
rename to src/ecmcDAQChannel.cpp
diff --git a/src/src/ecmcDAQChannel.h b/src/ecmcDAQChannel.h
similarity index 100%
rename from src/src/ecmcDAQChannel.h
rename to src/ecmcDAQChannel.h
diff --git a/src/src/ecmcDAQDataTypeBase.cpp b/src/ecmcDAQDataTypeBase.cpp
similarity index 100%
rename from src/src/ecmcDAQDataTypeBase.cpp
rename to src/ecmcDAQDataTypeBase.cpp
diff --git a/src/src/ecmcDAQDataTypeBase.h b/src/ecmcDAQDataTypeBase.h
similarity index 100%
rename from src/src/ecmcDAQDataTypeBase.h
rename to src/ecmcDAQDataTypeBase.h
diff --git a/src/src/ecmcDAQDataTypeGeneric.cpp b/src/ecmcDAQDataTypeGeneric.cpp
similarity index 100%
rename from src/src/ecmcDAQDataTypeGeneric.cpp
rename to src/ecmcDAQDataTypeGeneric.cpp
diff --git a/src/src/ecmcDAQDataTypeGeneric.h b/src/ecmcDAQDataTypeGeneric.h
similarity index 100%
rename from src/src/ecmcDAQDataTypeGeneric.h
rename to src/ecmcDAQDataTypeGeneric.h
diff --git a/src/src/ecmcDAQDefs.h b/src/ecmcDAQDefs.h
similarity index 100%
rename from src/src/ecmcDAQDefs.h
rename to src/ecmcDAQDefs.h
diff --git a/src/src/ecmcDAQWrap.cpp b/src/ecmcDAQWrap.cpp
similarity index 100%
rename from src/src/ecmcDAQWrap.cpp
rename to src/ecmcDAQWrap.cpp
diff --git a/src/src/ecmcDAQWrap.h b/src/ecmcDAQWrap.h
similarity index 100%
rename from src/src/ecmcDAQWrap.h
rename to src/ecmcDAQWrap.h
diff --git a/src/src/ecmcPluginDAQ.c b/src/ecmcPluginDAQ.c
similarity index 100%
rename from src/src/ecmcPluginDAQ.c
rename to src/ecmcPluginDAQ.c
diff --git a/src/src/.keep b/src/src/.keep
deleted file mode 100644
index e69de29..0000000