diff --git a/.gitignore b/.gitignore
index ad8f26d34..e168ec07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,5 @@ venv/
 .vscode/
 error
 pylint.out
-local/
 __pycache__/
 build/
\ No newline at end of file
diff --git a/conf/.gitignore b/conf/.gitignore
deleted file mode 100644
index 41b89ceb1..000000000
--- a/conf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-system.json
\ No newline at end of file
diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py
index e59b7cda2..d613410e9 100644
--- a/framework/python/src/core/testrun.py
+++ b/framework/python/src/core/testrun.py
@@ -39,8 +39,8 @@
 from device import Device
 
 LOGGER = logger.get_logger('test_run')
-CONFIG_FILE = 'conf/system.json'
-EXAMPLE_CONFIG_FILE = 'conf/system.json.example'
+CONFIG_FILE = 'local/system.json'
+EXAMPLE_CONFIG_FILE = 'local/system.json.example'
 RUNTIME = 120
 
 LOCAL_DEVICES_DIR = 'local/devices'
diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py
index f3c07e8e4..643dc4def 100644
--- a/framework/python/src/net_orc/network_orchestrator.py
+++ b/framework/python/src/net_orc/network_orchestrator.py
@@ -25,7 +25,6 @@
 import threading
 import docker
 from docker.types import Mount
-from collections import OrderedDict
 from common import logger
 from common import util
 from net_orc.listener import Listener
@@ -36,8 +35,8 @@
 from net_orc.ip_control import IPControl
 
 LOGGER = logger.get_logger('net_orc')
-CONFIG_FILE = 'conf/system.json'
-EXAMPLE_CONFIG_FILE = 'conf/system.json.example'
+CONFIG_FILE = 'local/system.json'
+EXAMPLE_CONFIG_FILE = 'local/system.json.example'
 RUNTIME_DIR = 'runtime'
 TEST_DIR = 'test'
 MONITOR_PCAP = 'monitor.pcap'
diff --git a/framework/python/src/net_orc/network_validator.py b/framework/python/src/net_orc/network_validator.py
index 4ee46124d..a4c51eb2d 100644
--- a/framework/python/src/net_orc/network_validator.py
+++ b/framework/python/src/net_orc/network_validator.py
@@ -28,7 +28,7 @@
 DEVICES_DIR = 'modules/devices'
 DEVICE_METADATA = 'conf/module_config.json'
 DEVICE_BRIDGE = 'tr-d'
-CONF_DIR = 'conf'
+CONF_DIR = 'local'
 CONF_FILE = 'system.json'
 
 
diff --git a/framework/python/src/net_orc/ovs_control.py b/framework/python/src/net_orc/ovs_control.py
index 3c950d4af..83823e8fa 100644
--- a/framework/python/src/net_orc/ovs_control.py
+++ b/framework/python/src/net_orc/ovs_control.py
@@ -18,7 +18,7 @@
 from common import logger
 from common import util
 
-CONFIG_FILE = 'conf/system.json'
+CONFIG_FILE = 'local/system.json'
 DEVICE_BRIDGE = 'tr-d'
 INTERNET_BRIDGE = 'tr-c'
 LOGGER = logger.get_logger('ovs_ctrl')
diff --git a/local/.gitignore b/local/.gitignore
new file mode 100644
index 000000000..4fb365c03
--- /dev/null
+++ b/local/.gitignore
@@ -0,0 +1,2 @@
+system.json
+devices
\ No newline at end of file
diff --git a/conf/system.json.example b/local/system.json.example
similarity index 100%
rename from conf/system.json.example
rename to local/system.json.example
diff --git a/testing/test_baseline b/testing/test_baseline
index bf191b88f..36d21fa5e 100755
--- a/testing/test_baseline
+++ b/testing/test_baseline
@@ -23,7 +23,7 @@ sudo /usr/share/openvswitch/scripts/ovs-ctl start
 # Build Test Container
 sudo docker build ./testing/docker/ci_baseline -t ci1 -f  ./testing/docker/ci_baseline/Dockerfile
 
-cat <<EOF >conf/system.json
+cat <<EOF >local/system.json
 {
   "network": {
     "device_intf": "endev0a",