diff --git a/.gitignore b/.gitignore
index 29a0f337d9..2d0f1d3b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,10 @@ __pycache__
 # PyCharm files
 .idea
 
+#Virtual Env Files
+Pipfile
+Pipfile.lock
+
 # Docs
 /docs/output
 /docs/rst_files
diff --git a/src/bcf/bcf/v2/__init__.py b/src/bcf/bcf/v2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/bcf/bcf/bcfxml.py b/src/bcf/bcf/v2/bcfxml.py
similarity index 100%
rename from src/bcf/bcf/bcfxml.py
rename to src/bcf/bcf/v2/bcfxml.py
diff --git a/src/bcf/bcf/data.py b/src/bcf/bcf/v2/data.py
similarity index 100%
rename from src/bcf/bcf/data.py
rename to src/bcf/bcf/v2/data.py
diff --git a/src/bcf/bcf/xsd/markup.xsd b/src/bcf/bcf/v2/xsd/markup.xsd
similarity index 100%
rename from src/bcf/bcf/xsd/markup.xsd
rename to src/bcf/bcf/v2/xsd/markup.xsd
diff --git a/src/bcf/bcf/xsd/project.xsd b/src/bcf/bcf/v2/xsd/project.xsd
similarity index 100%
rename from src/bcf/bcf/xsd/project.xsd
rename to src/bcf/bcf/v2/xsd/project.xsd
diff --git a/src/bcf/bcf/xsd/version.xsd b/src/bcf/bcf/v2/xsd/version.xsd
similarity index 100%
rename from src/bcf/bcf/xsd/version.xsd
rename to src/bcf/bcf/v2/xsd/version.xsd
diff --git a/src/bcf/bcf/xsd/visinfo.xsd b/src/bcf/bcf/v2/xsd/visinfo.xsd
similarity index 100%
rename from src/bcf/bcf/xsd/visinfo.xsd
rename to src/bcf/bcf/v2/xsd/visinfo.xsd
diff --git a/src/bcf/bcf/v3/__init__.py b/src/bcf/bcf/v3/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/bcf/bcf/v3/bcfapi.py b/src/bcf/bcf/v3/bcfapi.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/bcf/bcf/v3/bcfxml.py b/src/bcf/bcf/v3/bcfxml.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/bcf/bcf/v3/data.py b/src/bcf/bcf/v3/data.py
new file mode 100644
index 0000000000..e69de29bb2