diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/LICENSE b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/LICENSE
deleted file mode 100644
index 4fb35f0c..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-The Open Cell Library is intended for use by universities, other research activities, educational programs and Si2.org members. 
-However allowed, the Open Cell Library is not intended for commercial use. If you use the Open Cell Library for demonstration of commercial EDA tools
-it is required to mention, indicate that the library was developped by Nangate.
-
-If you have questions or concerns then please contact us at openlibrary@nangate.com
-
-The Open Cell Library is provided by Nangate under the following License:
-
-Nangate Open Cell Library License, Version 1.0. February 20, 2008
-
-Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the Open Cell Library and accompanying documentation (the "Library") covered by this license to use, reproduce, display, distribute, execute, and transmit the Library, and to prepare derivative works of the Library, and to permit third-parties to whom the Library is furnished to do so, all subject to the following:
-
-The copyright notices in the Library and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Library, in whole or in part, and all derivative works of the Library, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. The library has been generated using a non-optimized open PDK and is not suited for any commercial purpose. Measuring or benchmarking the Library against any other library or standard cell set is prohibited. Any meaningful library benchmarking must be done in collaboration with Nangate or other providers of optimized and production-ready PDKs.
-
-THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE LIBRARY BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY. 
-
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/.oalib b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/.oalib
deleted file mode 100644
index 21ffef89..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/.oalib
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-
-<Library DMSystem="oaDMFileSys">
-    <oaDMFileSys libReadOnly="No"
-                 origFileSystem="Unix"/>
-</Library>
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/tech.db b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/tech.db
deleted file mode 100644
index d06088ef..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/tech.db and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/layout.oa
deleted file mode 100644
index f506702a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/layout.oa
deleted file mode 100644
index 4d09be71..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_1/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/layout.oa
deleted file mode 100644
index ce668d6a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_2/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/layout.oa
deleted file mode 100644
index 1a444787..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_3/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/layout.oa
deleted file mode 100644
index bf190d8e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_4/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/layout.oa
deleted file mode 100644
index 1dae0e9f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_5/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/layout.oa
deleted file mode 100644
index 9ae9c282..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_6/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/layout.oa
deleted file mode 100644
index 21bb9728..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_7/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/layout.oa
deleted file mode 100644
index 9604d758..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via1_8/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/layout.oa
deleted file mode 100644
index 586345c4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/layout.oa
deleted file mode 100644
index ce4efe2b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_1/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/layout.oa
deleted file mode 100644
index e73e0129..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_2/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/layout.oa
deleted file mode 100644
index fab40b23..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_3/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/layout.oa
deleted file mode 100644
index 3799b110..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_4/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/layout.oa
deleted file mode 100644
index ad032f48..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_5/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/layout.oa
deleted file mode 100644
index 2e42f63e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_6/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/layout.oa
deleted file mode 100644
index da12275b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_7/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/layout.oa
deleted file mode 100644
index 6ecd3f1e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via2_8/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/layout.oa
deleted file mode 100644
index a01471e4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/layout.oa
deleted file mode 100644
index 72c16bec..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_1/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/layout.oa
deleted file mode 100644
index 47526ce7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via3_2/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/layout.oa
deleted file mode 100644
index 5992dde5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via4_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/layout.oa
deleted file mode 100644
index a6c5fdab..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via5_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/layout.oa
deleted file mode 100644
index 4ea99647..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via6_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/layout.oa
deleted file mode 100644
index 43c4979d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via7_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/layout.oa
deleted file mode 100644
index 23821474..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via8_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/layout.oa
deleted file mode 100644
index 621049f3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NCSU_FreePDK_45nm/via9_0/via/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/.oalib b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/.oalib
deleted file mode 100644
index 21ffef89..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/.oalib
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-
-<Library DMSystem="oaDMFileSys">
-    <oaDMFileSys libReadOnly="No"
-                 origFileSystem="Unix"/>
-</Library>
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/layout.oa
deleted file mode 100644
index 6bb134d6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/layout.oa
deleted file mode 100644
index 25d1dcd1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/netlist.oa
deleted file mode 100644
index ff2f6b51..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/layout.oa
deleted file mode 100644
index 38ff0762..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/layout.oa
deleted file mode 100644
index 33fa4f83..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/netlist.oa
deleted file mode 100644
index 3c7abb67..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/layout.oa
deleted file mode 100644
index 4c6f3e8f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/layout.oa
deleted file mode 100644
index 4c58e71e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/netlist.oa
deleted file mode 100644
index 25a5af0a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND2_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/layout.oa
deleted file mode 100644
index 3a0c2863..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/layout.oa
deleted file mode 100644
index 7eddad2b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/netlist.oa
deleted file mode 100644
index f2b44419..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/layout.oa
deleted file mode 100644
index b5ce6ce5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/layout.oa
deleted file mode 100644
index 37b54a8f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/netlist.oa
deleted file mode 100644
index a3092e18..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/layout.oa
deleted file mode 100644
index cd37476d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/layout.oa
deleted file mode 100644
index 7ca08fa2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/netlist.oa
deleted file mode 100644
index 910cbbbb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND3_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/layout.oa
deleted file mode 100644
index d438301f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/layout.oa
deleted file mode 100644
index 2bf6210b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/netlist.oa
deleted file mode 100644
index ecf6b9d9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/layout.oa
deleted file mode 100644
index 98883351..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/layout.oa
deleted file mode 100644
index 22d3ff43..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/netlist.oa
deleted file mode 100644
index 4e4653b1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/layout.oa
deleted file mode 100644
index cd536d22..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/layout.oa
deleted file mode 100644
index 089a23a5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/netlist.oa
deleted file mode 100644
index 630e0359..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AND4_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/layout.oa
deleted file mode 100644
index 07260e74..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/layout.oa
deleted file mode 100644
index 439ceb9a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/netlist.oa
deleted file mode 100644
index f57d5c89..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/ANTENNA_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/layout.oa
deleted file mode 100644
index 6b981375..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/layout.oa
deleted file mode 100644
index 0f90de92..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/netlist.oa
deleted file mode 100644
index d6f1393e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/layout.oa
deleted file mode 100644
index 39a1fb5c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/layout.oa
deleted file mode 100644
index 86b64ecb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/netlist.oa
deleted file mode 100644
index 31d161d4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/layout.oa
deleted file mode 100644
index 1657c760..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/layout.oa
deleted file mode 100644
index b68cab1f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/netlist.oa
deleted file mode 100644
index a07c5e58..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI211_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/layout.oa
deleted file mode 100644
index 001dab59..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/layout.oa
deleted file mode 100644
index 1fe2ffe8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/netlist.oa
deleted file mode 100644
index 37f31c7a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/layout.oa
deleted file mode 100644
index 8b7f21de..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/layout.oa
deleted file mode 100644
index 1500dd93..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/netlist.oa
deleted file mode 100644
index 8b4a9d6f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/layout.oa
deleted file mode 100644
index f48f64b0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/layout.oa
deleted file mode 100644
index ef639401..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/netlist.oa
deleted file mode 100644
index b0b681f4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI21_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/layout.oa
deleted file mode 100644
index 2e401087..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/layout.oa
deleted file mode 100644
index 83ae53b9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/netlist.oa
deleted file mode 100644
index 4866deb2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/layout.oa
deleted file mode 100644
index e929b3a2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/layout.oa
deleted file mode 100644
index aa7e67bf..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/netlist.oa
deleted file mode 100644
index 0285d40f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/layout.oa
deleted file mode 100644
index a08771f4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/layout.oa
deleted file mode 100644
index 12109e41..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/netlist.oa
deleted file mode 100644
index 70c6099f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI221_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/layout.oa
deleted file mode 100644
index 9551b300..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/layout.oa
deleted file mode 100644
index 8c6dd4dd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/netlist.oa
deleted file mode 100644
index 850da7d7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/layout.oa
deleted file mode 100644
index 041cd9a5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/layout.oa
deleted file mode 100644
index 3bc89506..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/netlist.oa
deleted file mode 100644
index 00e52234..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/layout.oa
deleted file mode 100644
index ca69828b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/layout.oa
deleted file mode 100644
index e47c1524..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/netlist.oa
deleted file mode 100644
index adb195e5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI222_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/layout.oa
deleted file mode 100644
index 2bc226c8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/layout.oa
deleted file mode 100644
index bfb3093b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/netlist.oa
deleted file mode 100644
index b6b7a885..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/layout.oa
deleted file mode 100644
index b60ddfd3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/layout.oa
deleted file mode 100644
index 6b4436f2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/netlist.oa
deleted file mode 100644
index 0807a046..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/layout.oa
deleted file mode 100644
index bf6566ae..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/layout.oa
deleted file mode 100644
index 0c022f7e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/netlist.oa
deleted file mode 100644
index fff696a5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/AOI22_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/layout.oa
deleted file mode 100644
index 5b8f512a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/layout.oa
deleted file mode 100644
index f1290eb7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/netlist.oa
deleted file mode 100644
index a79c772d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/layout.oa
deleted file mode 100644
index e869ee27..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/layout.oa
deleted file mode 100644
index 3a777650..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/netlist.oa
deleted file mode 100644
index 649be819..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X16/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/layout.oa
deleted file mode 100644
index c2dde77b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/layout.oa
deleted file mode 100644
index 2864f53a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/netlist.oa
deleted file mode 100644
index 2b657047..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/layout.oa
deleted file mode 100644
index 40607a8f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/layout.oa
deleted file mode 100644
index 6bda4cfd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/netlist.oa
deleted file mode 100644
index d85ddcd7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X32/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/layout.oa
deleted file mode 100644
index 2343c7ac..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/layout.oa
deleted file mode 100644
index e2b07fb7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/netlist.oa
deleted file mode 100644
index 26b6084b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/layout.oa
deleted file mode 100644
index 3939c750..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/layout.oa
deleted file mode 100644
index 9354330c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/netlist.oa
deleted file mode 100644
index 8fb5f6f2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/BUF_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/layout.oa
deleted file mode 100644
index b5954120..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/layout.oa
deleted file mode 100644
index 6762ea76..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/netlist.oa
deleted file mode 100644
index 2e83a28f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/layout.oa
deleted file mode 100644
index 745e04a4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/layout.oa
deleted file mode 100644
index 76b8808e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/netlist.oa
deleted file mode 100644
index 0c557781..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/layout.oa
deleted file mode 100644
index 6514ee31..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/layout.oa
deleted file mode 100644
index 7e23fbbf..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/netlist.oa
deleted file mode 100644
index b310fb2d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKBUF_X3/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/layout.oa
deleted file mode 100644
index 225de2b1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/layout.oa
deleted file mode 100644
index 74378f47..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/netlist.oa
deleted file mode 100644
index e3caf694..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/layout.oa
deleted file mode 100644
index e86a684b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/layout.oa
deleted file mode 100644
index 15ccb8f0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/netlist.oa
deleted file mode 100644
index 984ce453..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/layout.oa
deleted file mode 100644
index 9991a24a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/layout.oa
deleted file mode 100644
index f4dc5f71..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/netlist.oa
deleted file mode 100644
index e95a6767..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/layout.oa
deleted file mode 100644
index 7b89aaa6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/layout.oa
deleted file mode 100644
index 733f6aa6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/netlist.oa
deleted file mode 100644
index 071e8b38..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATETST_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/layout.oa
deleted file mode 100644
index 595b4872..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/layout.oa
deleted file mode 100644
index 288b1adb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/netlist.oa
deleted file mode 100644
index d693f169..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/layout.oa
deleted file mode 100644
index 79766594..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/layout.oa
deleted file mode 100644
index c9d88977..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/netlist.oa
deleted file mode 100644
index 0e740152..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/layout.oa
deleted file mode 100644
index 735ad9cc..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/layout.oa
deleted file mode 100644
index b2d4f0f3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/netlist.oa
deleted file mode 100644
index af623ebb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/layout.oa
deleted file mode 100644
index 294557f9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/layout.oa
deleted file mode 100644
index f6014e2c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/netlist.oa
deleted file mode 100644
index 6110ec78..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/CLKGATE_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/layout.oa
deleted file mode 100644
index 3086a03a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/layout.oa
deleted file mode 100644
index 5ab6bc7b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/netlist.oa
deleted file mode 100644
index 3f867cc0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/layout.oa
deleted file mode 100644
index 01156932..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/layout.oa
deleted file mode 100644
index d4f530f4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/netlist.oa
deleted file mode 100644
index 7bc094b3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFRS_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/layout.oa
deleted file mode 100644
index a1bd9548..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/layout.oa
deleted file mode 100644
index 96fcf8c5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/netlist.oa
deleted file mode 100644
index a092ab3e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/layout.oa
deleted file mode 100644
index 7ae8a9b4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/layout.oa
deleted file mode 100644
index dfc2c05c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/netlist.oa
deleted file mode 100644
index 58edeb41..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFR_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/layout.oa
deleted file mode 100644
index 6e3c4a8d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/layout.oa
deleted file mode 100644
index 69eb501b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/netlist.oa
deleted file mode 100644
index 9937e75c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/layout.oa
deleted file mode 100644
index 918c8f4c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/layout.oa
deleted file mode 100644
index 4e3354b9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/netlist.oa
deleted file mode 100644
index 125b674b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFFS_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/layout.oa
deleted file mode 100644
index d8e4ca08..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/layout.oa
deleted file mode 100644
index 30d8a956..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/netlist.oa
deleted file mode 100644
index 4e1d746c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/layout.oa
deleted file mode 100644
index c875a39e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/layout.oa
deleted file mode 100644
index 3ddd1736..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/netlist.oa
deleted file mode 100644
index a7fa807e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DFF_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/layout.oa
deleted file mode 100644
index a19da61d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/layout.oa
deleted file mode 100644
index c2fbc1f6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/netlist.oa
deleted file mode 100644
index 77c5cf65..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/layout.oa
deleted file mode 100644
index 3b548625..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/layout.oa
deleted file mode 100644
index 626b853b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/netlist.oa
deleted file mode 100644
index 46d11bf6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLH_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/layout.oa
deleted file mode 100644
index 2e0a82a7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/layout.oa
deleted file mode 100644
index 99f21b77..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/netlist.oa
deleted file mode 100644
index 00ea2086..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/layout.oa
deleted file mode 100644
index b7a1f875..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/layout.oa
deleted file mode 100644
index 80ed7afa..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/netlist.oa
deleted file mode 100644
index 0dcebbe6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/DLL_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/layout.oa
deleted file mode 100644
index b45aedd2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/layout.oa
deleted file mode 100644
index 7b7fa880..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/netlist.oa
deleted file mode 100644
index a60a9da8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FA_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/layout.oa
deleted file mode 100644
index 0546cc44..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/layout.oa
deleted file mode 100644
index 17c70ced..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/netlist.oa
deleted file mode 100644
index 0ee29c43..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/layout.oa
deleted file mode 100644
index 8237c14c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/layout.oa
deleted file mode 100644
index bc2e1ad2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/netlist.oa
deleted file mode 100644
index 270d8b79..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X16/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/layout.oa
deleted file mode 100644
index 7b72532e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/layout.oa
deleted file mode 100644
index 087c45fe..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/netlist.oa
deleted file mode 100644
index 535e441b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/layout.oa
deleted file mode 100644
index 8643daf1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/layout.oa
deleted file mode 100644
index 292f3f78..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/netlist.oa
deleted file mode 100644
index cefb75f1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X32/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/layout.oa
deleted file mode 100644
index b5e35ab3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/layout.oa
deleted file mode 100644
index 4d58dcc0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/netlist.oa
deleted file mode 100644
index 012dbbd8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/layout.oa
deleted file mode 100644
index ea07a127..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/layout.oa
deleted file mode 100644
index d30031cf..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/netlist.oa
deleted file mode 100644
index 02a57260..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/FILLCELL_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/layout.oa
deleted file mode 100644
index b1d5045c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/layout.oa
deleted file mode 100644
index f21ee131..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/netlist.oa
deleted file mode 100644
index da61a747..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/HA_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/layout.oa
deleted file mode 100644
index 236a9e55..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/layout.oa
deleted file mode 100644
index 47a74339..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/netlist.oa
deleted file mode 100644
index ce9f3aaa..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/layout.oa
deleted file mode 100644
index fa3270c9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/layout.oa
deleted file mode 100644
index 1bbbdd6e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/netlist.oa
deleted file mode 100644
index 98c310c1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X16/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/layout.oa
deleted file mode 100644
index 59257f38..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/layout.oa
deleted file mode 100644
index 201e9338..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/netlist.oa
deleted file mode 100644
index 7bb23d4c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/layout.oa
deleted file mode 100644
index 776a3979..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/layout.oa
deleted file mode 100644
index ef747868..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/netlist.oa
deleted file mode 100644
index 782132d5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X32/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/layout.oa
deleted file mode 100644
index 0c4a395e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/layout.oa
deleted file mode 100644
index edee9663..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/netlist.oa
deleted file mode 100644
index c40f47ff..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/layout.oa
deleted file mode 100644
index a057dc18..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/layout.oa
deleted file mode 100644
index a53752ec..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/netlist.oa
deleted file mode 100644
index a6e4b723..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/INV_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/layout.oa
deleted file mode 100644
index fd432ec3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/layout.oa
deleted file mode 100644
index 5dcf8752..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/netlist.oa
deleted file mode 100644
index b5cd78af..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC0_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/layout.oa
deleted file mode 100644
index e13d5912..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/layout.oa
deleted file mode 100644
index c049fa34..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/netlist.oa
deleted file mode 100644
index 8651ffc4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/LOGIC1_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/layout.oa
deleted file mode 100644
index 87f19084..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/layout.oa
deleted file mode 100644
index 17356df4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/netlist.oa
deleted file mode 100644
index 91cd60b5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/layout.oa
deleted file mode 100644
index 917e27be..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/layout.oa
deleted file mode 100644
index 21166996..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/netlist.oa
deleted file mode 100644
index 1897d639..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/MUX2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/layout.oa
deleted file mode 100644
index 10f298ee..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/layout.oa
deleted file mode 100644
index a219f94e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/netlist.oa
deleted file mode 100644
index 5dcf5639..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/layout.oa
deleted file mode 100644
index f4533bbb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/layout.oa
deleted file mode 100644
index 968d670c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/netlist.oa
deleted file mode 100644
index d705cfe9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/layout.oa
deleted file mode 100644
index 6301cd12..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/layout.oa
deleted file mode 100644
index 10f9a2f5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/netlist.oa
deleted file mode 100644
index 09044e37..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND2_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/layout.oa
deleted file mode 100644
index 99d04186..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/layout.oa
deleted file mode 100644
index abe50981..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/netlist.oa
deleted file mode 100644
index 818deaa9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/layout.oa
deleted file mode 100644
index 86e6e9bb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/layout.oa
deleted file mode 100644
index bc750674..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/netlist.oa
deleted file mode 100644
index 118cb499..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/layout.oa
deleted file mode 100644
index 7d287b34..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/layout.oa
deleted file mode 100644
index deaef50f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/netlist.oa
deleted file mode 100644
index d84ab7b9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND3_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/layout.oa
deleted file mode 100644
index d22b28b7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/layout.oa
deleted file mode 100644
index b8af0130..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/netlist.oa
deleted file mode 100644
index e119564d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/layout.oa
deleted file mode 100644
index 9f15cada..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/layout.oa
deleted file mode 100644
index 6f9d2a55..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/netlist.oa
deleted file mode 100644
index f6094b85..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/layout.oa
deleted file mode 100644
index dfb3652e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/layout.oa
deleted file mode 100644
index 4cb97321..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/netlist.oa
deleted file mode 100644
index cdcf4431..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NAND4_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/layout.oa
deleted file mode 100644
index 350f5b34..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/layout.oa
deleted file mode 100644
index 9aebadd9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/netlist.oa
deleted file mode 100644
index 519cd280..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/layout.oa
deleted file mode 100644
index 6e1a209a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/layout.oa
deleted file mode 100644
index 22e80218..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/netlist.oa
deleted file mode 100644
index d00d0b0a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/layout.oa
deleted file mode 100644
index 6828ebb1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/layout.oa
deleted file mode 100644
index 615b5ab3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/netlist.oa
deleted file mode 100644
index 2812b513..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR2_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/layout.oa
deleted file mode 100644
index a16fc4ac..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/layout.oa
deleted file mode 100644
index b68e85a3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/netlist.oa
deleted file mode 100644
index 1ae83cdd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/layout.oa
deleted file mode 100644
index 31a6e5f6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/layout.oa
deleted file mode 100644
index 01461a1c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/netlist.oa
deleted file mode 100644
index 2704299a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/layout.oa
deleted file mode 100644
index 582ba779..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/layout.oa
deleted file mode 100644
index bdbe127d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/netlist.oa
deleted file mode 100644
index 59ede82a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR3_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/layout.oa
deleted file mode 100644
index 5c57118e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/layout.oa
deleted file mode 100644
index 42430315..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/netlist.oa
deleted file mode 100644
index d2cc2664..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/layout.oa
deleted file mode 100644
index 950301d5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/layout.oa
deleted file mode 100644
index 45f2fba1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/netlist.oa
deleted file mode 100644
index 38cfe8d6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/layout.oa
deleted file mode 100644
index 33a051b1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/layout.oa
deleted file mode 100644
index 19870b67..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/netlist.oa
deleted file mode 100644
index 3588581e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/NOR4_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/layout.oa
deleted file mode 100644
index 24c676b6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/layout.oa
deleted file mode 100644
index ff62e108..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/netlist.oa
deleted file mode 100644
index c22a0f6b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/layout.oa
deleted file mode 100644
index c677f3fc..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/layout.oa
deleted file mode 100644
index 2df5bf60..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/netlist.oa
deleted file mode 100644
index 512761cd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/layout.oa
deleted file mode 100644
index e36586bf..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/layout.oa
deleted file mode 100644
index abfbe031..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/netlist.oa
deleted file mode 100644
index 24981ef9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI211_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/layout.oa
deleted file mode 100644
index 1adcde18..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/layout.oa
deleted file mode 100644
index 8fca04f5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/netlist.oa
deleted file mode 100644
index 810f817b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/layout.oa
deleted file mode 100644
index 0660525d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/layout.oa
deleted file mode 100644
index 84ba0a15..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/netlist.oa
deleted file mode 100644
index d96e2686..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/layout.oa
deleted file mode 100644
index f3078436..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/layout.oa
deleted file mode 100644
index dfe80466..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/netlist.oa
deleted file mode 100644
index dbb948eb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI21_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/layout.oa
deleted file mode 100644
index 4ad0f72a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/layout.oa
deleted file mode 100644
index 72cac838..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/netlist.oa
deleted file mode 100644
index 74a27bae..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/layout.oa
deleted file mode 100644
index 94f9db38..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/layout.oa
deleted file mode 100644
index 2774c300..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/netlist.oa
deleted file mode 100644
index 9b07c609..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/layout.oa
deleted file mode 100644
index 8773eac6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/layout.oa
deleted file mode 100644
index 292c5d79..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/netlist.oa
deleted file mode 100644
index d939ae67..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI221_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/layout.oa
deleted file mode 100644
index 7f91ede5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/layout.oa
deleted file mode 100644
index a869a094..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/netlist.oa
deleted file mode 100644
index 6abd6b6c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/layout.oa
deleted file mode 100644
index f032ef6f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/layout.oa
deleted file mode 100644
index 38fb0d04..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/netlist.oa
deleted file mode 100644
index b2707964..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/layout.oa
deleted file mode 100644
index 80c6024e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/layout.oa
deleted file mode 100644
index b3511d55..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/netlist.oa
deleted file mode 100644
index 84567289..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI222_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/layout.oa
deleted file mode 100644
index a65fd9e0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/layout.oa
deleted file mode 100644
index 56cd8cfb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/netlist.oa
deleted file mode 100644
index 7992c682..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/layout.oa
deleted file mode 100644
index 6319db4a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/layout.oa
deleted file mode 100644
index 219bcb4b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/netlist.oa
deleted file mode 100644
index 7107ee41..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/layout.oa
deleted file mode 100644
index 7ea5c322..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/layout.oa
deleted file mode 100644
index e4796f81..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/netlist.oa
deleted file mode 100644
index d430d442..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI22_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/layout.oa
deleted file mode 100644
index 56da35b3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/layout.oa
deleted file mode 100644
index c38b3404..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/netlist.oa
deleted file mode 100644
index 7c25c728..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OAI33_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/layout.oa
deleted file mode 100644
index e39ec74f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/layout.oa
deleted file mode 100644
index 3a4f2da9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/netlist.oa
deleted file mode 100644
index 028aadff..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/layout.oa
deleted file mode 100644
index 85095f70..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/layout.oa
deleted file mode 100644
index c324ab5a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/netlist.oa
deleted file mode 100644
index c92afdaa..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/layout.oa
deleted file mode 100644
index 0c78c632..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/layout.oa
deleted file mode 100644
index 6714a930..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/netlist.oa
deleted file mode 100644
index 46aa6aa8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR2_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/layout.oa
deleted file mode 100644
index df72b78a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/layout.oa
deleted file mode 100644
index 20387f88..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/netlist.oa
deleted file mode 100644
index 4c523a62..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/layout.oa
deleted file mode 100644
index d9a77079..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/layout.oa
deleted file mode 100644
index 03af12d7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/netlist.oa
deleted file mode 100644
index 8b074b4f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/layout.oa
deleted file mode 100644
index 398cdfb0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/layout.oa
deleted file mode 100644
index a036d637..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/netlist.oa
deleted file mode 100644
index 279696da..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR3_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/layout.oa
deleted file mode 100644
index e60318bd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/layout.oa
deleted file mode 100644
index e90412fb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/netlist.oa
deleted file mode 100644
index 51f9e3e0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/layout.oa
deleted file mode 100644
index fae7a3fb..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/layout.oa
deleted file mode 100644
index d035d31c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/netlist.oa
deleted file mode 100644
index aa2bb6f0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/layout.oa
deleted file mode 100644
index 045c0da4..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/layout.oa
deleted file mode 100644
index a2b396ef..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/netlist.oa
deleted file mode 100644
index c53edd13..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/OR4_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/layout.oa
deleted file mode 100644
index d4c1f635..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/layout.oa
deleted file mode 100644
index 958eca6c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/netlist.oa
deleted file mode 100644
index a0dece8e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/layout.oa
deleted file mode 100644
index ee485ea1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/layout.oa
deleted file mode 100644
index 7d0590c1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/netlist.oa
deleted file mode 100644
index 49484fba..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFRS_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/layout.oa
deleted file mode 100644
index 7f5a9cfd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/layout.oa
deleted file mode 100644
index 3032b0a0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/netlist.oa
deleted file mode 100644
index 4d89a502..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/layout.oa
deleted file mode 100644
index 629468b3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/layout.oa
deleted file mode 100644
index 6d85c71a..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/netlist.oa
deleted file mode 100644
index 6db46f42..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFR_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/layout.oa
deleted file mode 100644
index 93300ffd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/layout.oa
deleted file mode 100644
index f89ea5e1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/netlist.oa
deleted file mode 100644
index 6f1f3098..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/layout.oa
deleted file mode 100644
index 79749b15..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/layout.oa
deleted file mode 100644
index e96b71d5..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/netlist.oa
deleted file mode 100644
index dfbcc1e8..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFFS_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/layout.oa
deleted file mode 100644
index f0d21165..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/layout.oa
deleted file mode 100644
index 7819c713..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/netlist.oa
deleted file mode 100644
index c78e535f..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/layout.oa
deleted file mode 100644
index d08b62b7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/layout.oa
deleted file mode 100644
index 4015b3dc..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/netlist.oa
deleted file mode 100644
index c4e8a15b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/SDFF_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/layout.oa
deleted file mode 100644
index f54127f1..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/layout.oa
deleted file mode 100644
index 84e8bf3d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/netlist.oa
deleted file mode 100644
index cc4b0d1b..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/layout.oa
deleted file mode 100644
index 54eca30e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/layout.oa
deleted file mode 100644
index 6040bb06..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/netlist.oa
deleted file mode 100644
index 357c6abf..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X16/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/layout.oa
deleted file mode 100644
index 27f7fbf0..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/layout.oa
deleted file mode 100644
index f13c8159..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/netlist.oa
deleted file mode 100644
index ebe22fbd..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/layout.oa
deleted file mode 100644
index dce55a10..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/layout.oa
deleted file mode 100644
index aeaadc03..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/netlist.oa
deleted file mode 100644
index 6784a7c3..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X4/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/layout.oa
deleted file mode 100644
index 5e5d9d95..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/layout.oa
deleted file mode 100644
index a5abd31e..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/netlist.oa
deleted file mode 100644
index 683cd138..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TBUF_X8/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/layout.oa
deleted file mode 100644
index a20160b7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/layout.oa
deleted file mode 100644
index 5bc9e473..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/netlist.oa
deleted file mode 100644
index daadfa5c..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TINV_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/layout.oa
deleted file mode 100644
index 0f9a3a91..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/layout.oa
deleted file mode 100644
index 4c71b43d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/netlist.oa
deleted file mode 100644
index 77cfbcb9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/TLAT_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/layout.oa
deleted file mode 100644
index 11eda70d..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/layout.oa
deleted file mode 100644
index be7d7d29..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/netlist.oa
deleted file mode 100644
index af8407b2..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/layout.oa
deleted file mode 100644
index ff0d8e54..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/layout.oa
deleted file mode 100644
index c60b08ec..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/netlist.oa
deleted file mode 100644
index fe2c3420..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XNOR2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/layout.oa
deleted file mode 100644
index 40d7c144..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/layout.oa
deleted file mode 100644
index d2943604..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/netlist.oa
deleted file mode 100644
index 7df23ff7..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X1/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/layout.oa
deleted file mode 100644
index fbe46ed9..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/abstract/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/layout.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/layout.oa
deleted file mode 100644
index ab70d517..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/layout.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/master.tag
deleted file mode 100644
index 431d8f04..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/layout/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-layout.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/master.tag b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/master.tag
deleted file mode 100644
index eef01142..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/master.tag
+++ /dev/null
@@ -1,2 +0,0 @@
--- Master.tag File, Rev:1.0
-netlist.oa
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/netlist.oa b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/netlist.oa
deleted file mode 100644
index 386000d6..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/XOR2_X2/netlist/netlist.oa and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/data.dm b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/data.dm
deleted file mode 100644
index e99f7274..00000000
Binary files a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/NangateOpenCellLibrary/data.dm and /dev/null differ
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/cds.lib b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/cds.lib
deleted file mode 120000
index 484ef186..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/cds.lib
+++ /dev/null
@@ -1 +0,0 @@
-lib.defs
\ No newline at end of file
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/display.drf b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/display.drf
deleted file mode 100644
index 7923ae62..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/display.drf
+++ /dev/null
@@ -1,3445 +0,0 @@
-;==========================================================================
-;
-; $Id: display.drf 61 2007-07-24 20:05:21Z mdbucher $
-; 
-;--------------------------------------------------------------------------
-
-drDefineDisplay(
-;( DisplayName )
- ( display    ) ;-- Screen   --
- ( psc        ) ;-- Color PS -- 
- ( psb        ) ;-- B&W PS   --
-)
-
-
-; -------------------------------------------------------------------
-; ------ Display information for the display device 'display'. ------
-; -------------------------------------------------------------------
-
-drDefineColor(
-;( DisplayName   ColorName   Red   Green   Blue   Blink )
-;( -----------   ---------   ---   -----   ----   ----- )
- ( display       white       255    255    255  )
- ( display       blinkWhite  255    255    255    t )
- ( display       silver      217    230    255  )
- ( display       cream       255    255    204  )
- ( display       pink        255    191    242  )
- ( display       magenta     255    0      255  )
- ( display       lime        0      255    0    )
- ( display       tan         255    230    191  )
- ( display       cyan        0      255    255  )
- ( display       cadetBlue   57     191    255  )
- ( display       yellow      255    255    0    )
- ( display       blinkYellow 255    255    0      t ) ; jts
- ( display       orange      255    128    0    )
- ( display       red         255    0      0    )
- ( display       purple      153    0      230  )
- ( display       green       0      204    102  )
- ( display       brown       191    64     38   )
- ( display       blue        0      0      255  )
- ( display       slate       140    140    166  )
- ( display       gold        217    204    0    )
- ( display       maroon      230    31     13   )
- ( display       violet      94     0      230  )
- ( display       forest      38     140    107  )
- ( display       chocolate   128    38     38   )
- ( display       navy        51     51     153  )
- ( display       black       0      0      0    )
- ( display       winBack     224    224    224  )
- ( display       winFore     128    0      0    )
- ( display       winText     51     51     51   )
- ( display       winColor1   166    166    166  )
- ( display       winColor2   115    115    115  )
- ( display       winColor3   189    204    204  )
- ( display       winColor4   204    204    204  )
- ( display       winColor5   199    199    199  )
- ( display       lightpink   255    196    209  )
- 
-;---- cmosx below -------------------------------
- ( display       gray        204    204    217  )
- ( display       volorange   255    164    0    )
-
-)
-
-drDefineStipple(
-;( DisplayName   StippleName     Bitmap )
-;( -----------   -----------     ------ )
-
- ( display      blank        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      solid        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( display      dots         (
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      hLine        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( display      hLine2       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( display      vLine        (
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                             ) )
- ( display      vLine2       (
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                             ) )
- ( display      cross        (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                             ) )
- ( display      miniHatch    (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      grid         (
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( display      slash        (
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                             ) )
- ( display      halfslash    (
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                             ) )
- ( display      backSlash    (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                             ) )
- ( display      hZigZag      (
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 1 0 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                             ) )
- ( display      vZigZag      (
-                              (1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0)
-                              (1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1)
-                              (1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0)
-                              (1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1)
-                             ) )
- ( display      rvZigZag     (
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                             ) )
- ( display      hCurb        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      vCurb        (
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                             ) )
- ( display      brick        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                             ) )
- ( display      dagger       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                             ) )
- ( display      triangle     (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      x            (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                             ) )
- ( display      dot1         (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      dot2         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      dot3         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      dot4         ( 
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      checker      (
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                             ) )
- ( display      viap         (
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                             ) )
- ( display      metal1S      (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1)
-                             ) )
- ( display      metal2S      (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                             ) )
- ( display      gnd2S        (
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                             ) )
- ( display      vcc2S        (
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                             ) )
- ( display      vcc1S        (
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                             ) )
- ( display      poly2p       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 1 0 0 1 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      contp        (
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      pplusp       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      wellp        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      checker1     (
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                             ) )
- ( display      checker2     (
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                             ) )
- ( display      invCross     (
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                             ) )
- ( display      wellBp       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 0 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 0 1 1 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
-( display      wellvtg      (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
-( display      wellvth      (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
-( display      thickox       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display      cwellBp      (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
-
- ( display      capID        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 1 1 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( display       resID        ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 1 1 1 0 1 0 0 1 1 1 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
- ( display       diodeID      ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 1 1 1 1 0 0 0 1 1 1 1 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
-
-)
-
-drDefineLineStyle(
-;( DisplayName   LineStyle     Size    Pattern )
-;( -----------   ---------     ----    ------- )
- ( display       solid          1      (1 1 1) )
- ( display       dashed         1      (1 1 1 1 0 0) )
- ( display       dots           1      (1 0 0) )
- ( display       dashDot        1      (1 1 1 0 0 1 0 0) )
- ( display       shortDash      1      (1 1 0 0) )
- ( display       doubleDash     1      (1 1 1 1 0 0 1 1 0 0) )
- ( display       hidden         1      (1 0 0 0) )
- ( display       thickLine      3      (1 1 1) )
- ( display       mLine          2      (1 1 1) )
- )
-
-drDefinePacket(
-;( DisplayName   PacketName           Stipple    LineStyle    Fill      Outline )
-;( -----------   ----------           -------    ---------    ----      ------- )
- ( display       default              blank      solid       green      green      )
- ( display       hdrcBnd              blank      solid       white      white      )
- ( display       nwell                wellp      solid       green      green      )
- ( display       nwellNet             blank      solid       green      green      )
- ( display       nwellPin             X          solid       green      green      )
- ( display       pwell                wellp      solid       orange     orange     )
- ( display       pwellNet             blank      solid       orange     orange     )
- ( display       pwellPin             X          solid       orange     orange     )
- ( display       pbase                checker2   solid       orange     orange     )
- ( display       pbaseNet             blank      solid       orange     orange     )
- ( display       pbasePin             X          solid       orange     orange     )
- ( display  	 vtg		      wellvtg    dashed      blue       blue       )
- ( display  	 vtgNet		      blank      dashed      blue       blue       )
- ( display  	 vth		      wellvth    dashed      blue       blue       )
- ( display  	 vthNet		      blank      dashed      blue       blue       )
- ( display       active               contp      solid       green      green      )
- ( display       activeNet            blank      solid       green      green      )
- ( display       activePin            X          solid       green      green      )
- ( display 	 thkox		      thickox    solid	     yellow     yellow     )
- ( display 	 thkoxLbl	      blank      solid	     yellow     yellow     )
- ( display       nimplant             triangle   solid       green      green      )
- ( display       pimplant             triangle   solid       orange     orange     )
- ( display       poly                 checker1   solid       red        red        )
- ( display       polyNet              blank      solid       red        red        )
- ( display       polyPin              X          solid       red        red        )
- ( display       polyLbl              blank      solid       red        red        )
- ( display       polyBnd              blank      solid       red        red        )
- ( display       sblock               brick      solid       blue       blue       )
- ( display       highres              resID      solid       blue       blue       )
- ( display       elec                 checker2   solid       yellow     yellow     )
- ( display       elecNet              blank      solid       yellow     yellow     )
- ( display       elecPin              X          solid       yellow     yellow     )
- ( display       elecLbl              blank      solid       yellow     yellow     )
- ( display       elecBnd              blank      solid       yellow     yellow     )
- ( display       metal1               backSlash  solid       blue       blue       )
- ( display       metal1Net            blank      solid       blue       blue       )
- ( display       metal1Pin            X          solid       blue       blue       )
- ( display       metal1Lbl            blank      solid       blue       blue       )
- ( display       metal1Bnd            blank      solid       blue       blue       )
- ( display       contact              X          solid       black      lime       )
- ( display       contactNe            blank      solid       brown      brown      )
- ( display       contactPin           X          solid       black      black      )
- ( display       contactLbl           blank      solid       black      black      )
- ( display       contactBnd           blank      solid       black      black      )
- ( display       metal2               dots       solid       magenta    magenta    )
- ( display       metal2Net            blank      solid       magenta    magenta    )
- ( display       metal2Pin            X          solid       magenta    magenta    )
- ( display       metal2Lbl            blank      solid       magenta    magenta    )
- ( display       metal2Bnd            blank      solid       magenta    magenta    )
- ( display       via1                 invCross   solid       magenta    navy       )
- ( display       via1Net              blank      solid       purple     black      )
- ( display       via1Pin              X          solid       purple     black      )
- ( display       via1Lbl              blank      solid       purple     black      )
- ( display       via1Bnd              blank      solid       purple     black      )
- ( display       metal3               halfslash  solid       cyan       cyan       )
- ( display       metal3Net            blank      solid       cyan       cyan       )
- ( display       metal3Pin            X          solid       cyan       cyan       )
- ( display       metal3Lbl            blank      solid       cyan       cyan       )
- ( display       metal3Bnd            blank      solid       cyan       cyan       )
- ( display       via2                 invCross   solid       cadetBlue  cadetBlue  )
- ( display       via2Net              blank      solid       cadetBlue  cadetBlue  )
- ( display       via2Pin              X          solid       cadetBlue  cadetBlue  )
- ( display       via2Lbl              blank      solid       cadetBlue  cadetBlue  )
- ( display       via2Bnd              blank      solid       cadetBlue  cadetBlue  )
- ( display       metal4               dot4       solid       cream      cream      )
- ( display       metal4Net            blank      solid       cream      cream      )
- ( display       metal4Pin            X          solid       cream      cream      )
- ( display       metal4Lbl            blank      solid       cream      cream      )
- ( display       metal4Bnd            blank      solid       cream      cream      )
- ( display       via3                 invCross   solid       tan        tan        )
- ( display       via3Net              blank      solid       tan        tan        )
- ( display       via3Pin              X          solid       tan        tan        )
- ( display       via3Lbl              blank      solid       tan        tan        )
- ( display       via3Bnd              blank      solid       tan        tan        )
- ( display       metal5               metal2S    solid       cadetBlue  cadetBlue  )
- ( display       metal5Net            blank      solid       cadetBlue  cadetBlue  )
- ( display       metal5Pin            X          solid       cadetBlue  cadetBlue  )
- ( display       metal5Lbl            blank      solid       cadetBlue  cadetBlue  )
- ( display       metal5Bnd            blank      solid       cadetBlue  cadetBlue  )
- ( display       via4                 invCross   solid       blue       blue       )
- ( display       via4Net              blank      solid       blue       blue       )
- ( display       via4Pin              X          solid       blue       blue       )
- ( display       via4Lbl              blank      solid       blue       blue       )
- ( display       via4Bnd              blank      solid       blue       blue       )
- ( display       metal6               miniHatch  solid       gold       gold       )
- ( display       metal6Net            blank      solid       gold       gold       )
- ( display       metal6Pin            X          solid       gold       gold       )
- ( display       metal6Lbl            blank      solid       gold       gold       )
- ( display       metal6Bnd            blank      solid       gold       gold       )
- ( display       via5                 invCross   solid       yellow     yellow     )
- ( display       via5Net              blank      solid       yellow     yellow     )
- ( display       via5Pin              X          solid       yellow     yellow     )
- ( display       via5Lbl              blank      solid       yellow     yellow     )
- ( display       via5Bnd              blank      solid       yellow     yellow     )
- ( display       metal7               halfslash  solid       lime       lime       )
- ( display       metal7Net            blank      solid       lime       lime       )
- ( display       metal7Pin            X          solid       lime       lime       )
- ( display       metal7Lbl            blank      solid       lime       lime       )
- ( display       metal7Bnd            blank      solid       lime       lime       )
- ( display       via6                 invCross   solid       magenta    magenta    )
- ( display       via6Net              blank      solid       magenta    magenta    )
- ( display       via6Pin              X          solid       magenta    magenta    ) 
- ( display       via6Lbl              blank      solid       magenta    magenta    )
- ( display       via6Bnd              blank      solid       magenta    magenta    ) 
- ( display       metal8               hLine2     solid       white      white      )
- ( display       metal8Net            blank      solid       white      white      )
- ( display       metal8Pin            X          solid       white      white      )
- ( display       metal8Lbl            blank      solid       white      white      )
- ( display       metal8Bnd            blank      solid       white      white      )
- ( display       via7                 invCross   solid       cadetBlue  cadetBlue  )
- ( display       via7Net              blank      solid       cadetBlue  cadetBlue  )
- ( display       via7Pin              X          solid       cadetBlue  cadetBlue  )
- ( display       via7Lbl              blank      solid       cadetBlue  cadetBlue  )
- ( display       via7Bnd              blank      solid       cadetBlue  cadetBlue  )
- ( display       metal9               vLine2     solid       tan        tan        )
- ( display       metal9Net            blank      solid       tan        tan        )
- ( display       metal9Pin            X          solid       tan        tan        )
- ( display       metal9Lbl            blank      solid       tan        tan        )
- ( display       metal9Bnd            blank      solid       tan        tan        )
- ( display       via8                 invCross   solid       cream      cream      )
- ( display       via8Net              blank      solid       cream      cream      )
- ( display       via8Pin              X          solid       cream      cream      )
- ( display       via8Lbl              blank      solid       cream      cream      )
- ( display       via8Bnd              blank      solid       cream      cream      )
- ( display       metal10              metal2S    solid       orange     orange     )
- ( display       metal10Net           blank      solid       orange     orange     )
- ( display       metal10Pin           X          solid       orange     orange     )
- ( display       metal10Lbl           blank      solid       orange     orange     )
- ( display       metal10Bnd           blank      solid       orange     orange     )
- ( display       via9                 invCross   solid       blue       blue       )
- ( display       via9Net              blank      solid       blue       blue       )
- ( display       via9Pin              X          solid       blue       blue       )
- ( display       via9Lbl              blank      solid       blue       blue       )
- ( display       via9Bnd              blank      solid       blue       blue       )
- ( display       glass                vLine      solid       slate      slate      )
- ( display       open                 vCurb      solid       violet     violet     )
- ( display       openNet              blank      solid       violet     violet     )
- ( display       openPin              X          solid       violet     violet     )
- ( display       openLbl              blank      solid       violet     violet     )
- ( display       openBnd              blank      solid       violet     violet     )
- ( display       pstop                dagger     solid       maroon     maroon     )
- ( display       pstopNet             blank      solid       maroon     maroon     )
- ( display       pstopPin             X          solid       maroon     maroon     )
- ( display       pstopLbl             blank      solid       maroon     maroon     )
- ( display       pstopBnd             blank      solid       maroon     maroon     )
- ( display       pad                  X          doubleDash  yellow     yellow     )
- ( display       nodrc                X          doubleDash  cyan       cyan       )
- ( display       nolpe                dot3       doubleDash  tan        tan        )
- ( display       cap_id               capID      doubleDash  slate      slate      )
- ( display       res_id               resID      doubleDash  slate      slate      )
- ( display       dio_id               diodeID    doubleDash  slate      slate      )
- ( display       metalcap             miniHatch  solid       violet     violet     )
- ( display       metalcapBnd          miniHatch  solid       violet     violet     )
- ( display       metalcapPin          X          solid       violet     violet     )
- ( display       metalcapNet          blank      solid       violet     violet     )
- ( display       metalcapLbl          blank      solid       violet     violet     )
- ( display       background           solid      solid       black      black      )
- ( display       grid                 blank      solid       slate      slate      )
- ( display       grid1                blank      solid       white      white      )
- ( display       axis                 blank      solid       white      white      )
- ( display       instance             blank      solid       red        red        )
- ( display       instanceLbl          blank      solid       red        red        )
- ( display       prBoundary           blank      solid       purple     purple     )
- ( display       prBoundaryBnd        blank      solid       cyan       cyan       )
- ( display       prBoundaryLbl        blank      solid       purple     purple     )
- ( display       align                blank      solid       tan        tan        )
- ( display       hardFence            blank      solid       red        red        )
- ( display       softFence            blank      solid       yellow     yellow     )
- ( display       text                 blank      solid       white      white      )
- ( display       text1                blank      dashed      white      white      )
- ( display       text2                solid      solid       white      white      )
- ( display       border               blank      solid       tan        tan        )
- ( display       device               blank      solid       green      green      )
- ( display       device2              blank      dashed      green      green      )
- ( display       device1              solid      solid       green      green      )
- ( display       wire                 solid      solid       cadetBlue  cadetBlue  )
- ( display       wireLbl              solid      solid       cadetBlue  cadetBlue  )
- ( display       wireFlt              blank      dashed      red        red        )
- ( display       deviceAnt            blank      solid       yellow     yellow     )
- ( display       deviceLbl            blank      solid       green      green      )
- ( display       pinLbl               blank      solid       red        red        )
- ( display       pin                  solid      solid       red        red        )
- ( display       pinAnt               blank      solid       red        red        )
- ( display       annotate             blank      solid       orange     orange     )
- ( display       annotate1            blank      solid       pink       pink       )
- ( display       annotate2            blank      solid       lime       lime       )
- ( display       annotate3            blank      solid       cyan       cyan       )
- ( display       annotate4            blank      solid       yellow     yellow     )
- ( display       annotate5            blank      solid       white      white      )
- ( display       annotate6            blank      solid       silver     silver     )
- ( display       annotate7            blank      solid       red        red        )
- ( display       annotate8            blank      solid       tan        tan        )
- ( display       annotate9            blank      solid       green      green      )
- ( display       edgeLayer            blank      solid       winColor5  winColor5  )
- ( display       edgeLayerPin         blank      solid       yellow     yellow     )
- ( display       snap                 blank      solid       yellow     yellow     )
- ( display       stretch              blank      solid       yellow     yellow     )
- ( display       y0                   blank      dashed      magenta    magenta    )
- ( display       y1                   blank      dashed      brown      brown      )
- ( display       y2                   blank      dashed      red        red        )
- ( display       y3                   blank      dashed      pink       pink       )
- ( display       y4                   blank      dashed      orange     orange     )
- ( display       y5                   blank      dashed      green      green      )
- ( display       y6                   blank      dashed      blue       blue       )
- ( display       y7                   blank      dashed      purple     purple     )
- ( display       y8                   blank      dashed      gold       gold       )
- ( display       y9                   blank      dashed      silver     silver     )
- ( display       hilite               blank      thickLine   white      white      )
- ( display       hilite1              blank      solid       magenta    magenta    )
- ( display       hilite2              blank      solid       orange     orange     )
- ( display       hilite3              blank      solid       cyan       cyan       )
- ( display       hilite4              blank      solid       tan        tan        )
- ( display       hilite5              blank      solid       lime       lime       )
- ( display       hilite6              blank      solid       orange     orange     )
- ( display       hilite7              blank      solid       cream      cream      )
- ( display       hilite8              blank      solid       magenta    magenta    )
- ( display       hilite9              blank      solid       pink       pink       )
- ( display       implant               blank      solid       orange     orange     )
- ( display       drive                blank      solid       blue       blue       )
- ( display       hiz                  blank      solid       orange     orange     )
- ( display       resist               blank      solid       cyan       cyan       )
- ( display       spike                blank      solid       purple     purple     )
- ( display       supply               blank      solid       lime       lime       )
- ( display       unknown              blank      solid       yellow     yellow     )
- ( display       unset                blank      solid       forest     forest     )
- ( display       designFlow           solid      solid       green      green      )
- ( display       designFlow1          solid      solid       red        red        )
- ( display       designFlow2          solid      solid       purple     purple     )
- ( display       designFlow3          solid      solid       pink       pink       )
- ( display       designFlow4          solid      solid       black      black      )
- ( display       designFlow5          solid      solid       silver     silver     )
- ( display       designFlow6          solid      solid       tan        tan        )
- ( display       designFlow7          solid      solid       cyan       cyan       )
- ( display       designFlow8          solid      solid       navy       navy       )
- ( display       designFlow9          solid      solid       orange     orange     )
- ( display       changedLayerTl0      blank      solid       red        red        )
- ( display       changedLayerTl1      blank      solid       yellow     yellow     )
- ( display       markerWarn           X          solid       yellow     yellow     )
- ( display       markerErr            X          solid       white      white      )
- ( display       Row                  blank      solid       cyan       cyan       )
- ( display       RowLbl               blank      solid       cyan       cyan       )
- ( display       Group                dots       solid       green      green      )
- ( display       GroupLbl             blank      solid       green      green      )
- ( display       Cannotoccupy         X          solid       red        red        )
- ( display       CannotoccupyBnd      blank      solid       red        red        )
- ( display       Canplace             blank      solid       cyan       cyan       )
- ( display       Unrouted             blank      dashed      winColor5  winColor5  )
- ( display       Unrouted1            blank      dashed      brown      brown      )
- ( display       Unrouted2            blank      dashed      red        red        )
- ( display       Unrouted3            blank      dashed      pink       pink       )
- ( display       Unrouted4            blank      dashed      orange     orange     )
- ( display       Unrouted5            blank      dashed      green      green      )
- ( display       Unrouted6            blank      dashed      blue       blue       )
- ( display       Unrouted7            blank      dashed      purple     purple     )
- ( display       Unrouted8            blank      dashed      gold       gold       )
- ( display       Unrouted9            blank      dashed      silver     silver     )
-
-;---- cmosx below ------------------------------------------------------------------
- ( display       NdiffResMask         metal1S    solid       green      green      )
- ( display       NLDD_Block           dagger     solid       cream      cream      )
- ( display       PLDD_Block           dagger     solid       orange     orange     )
- ( display       glass2               blank      solid       silver     silver     )
- ( display       PdiffResMask         metal1S    solid       brown      brown      )
- ( display       NwellResMask         metal1S    solid       lime       lime       )
- ( display       PwellResMask         metal1S    solid       orange     orange     )
- ( display       celltag              blank      solid       silver     silver     )
- ( display       cellpwrtext          blank      solid       yellow     yellow     )
- ( display       celliotext           blank      solid       yellow     yellow     )
- ( display       cellnametext         blank      solid       yellow     yellow     )
- ( display       cellioterm           blank      solid       yellow     yellow     )
- ( display       cellbox              blank      solid       yellow     yellow     )
- ( display       PolyResMask          metal1S    solid       red        red        )
- ( display       M1ResMask            metal1S    solid       blue       blue       )
- ( display       M2ResMask            metal1S    solid       magenta    magenta    )
- ( display       polytext             blank      solid       yellow     yellow     )
- ( display       paatext              blank      solid       yellow     yellow     )
- ( display       naatext              blank      solid       yellow     yellow     )
- ( display       pwelltext            blank      solid       yellow     yellow     )
- ( display       nwelltext            blank      solid       yellow     yellow     )
- ( display       psubtext             blank      solid       yellow     yellow     )
- ( display       metal2text           blank      solid       cyan       cyan       )
- ( display       metal1text           blank      solid       violet     violet     )
- ( display       aaPin                X          solid       volorange  volorange  )
- ( display       nplus                blank      solid       green      green      )
- ( display       aa                   blank      solid       volorange  volorange  )
- ( display       pplus                blank      solid       brown      brown      )
- ( display       aaNet                blank      solid       volorange  volorange  )
- ( display       contact              X          solid       white      white      )
- ( display       contactNet           blank      solid       winColor5  winColor5  )
- ( display       contactPin           blank      solid       red        red        )
- ( display       glasscut             blank      solid       yellow     yellow     )
- ( display       NdiffNet             blank      solid       green      green      )
- ( display       Ndiff                dagger     solid       green      green      )
- ( display       PdiffPin             X          solid       brown      brown      )
- ( display       NdiffPin             X          solid       green      green      )
- ( display       PdiffNet             blank      solid       brown      brown      )
- ( display       Pdiff                dagger     solid       brown      brown      )
- ( display       Met1TopTxt           blank      solid       violet     violet     )
- ( display       Met2TopTxt           blank      solid       cyan       cyan       )
- ( display       Met3TopTxt           blank      solid       tan        tan        )
- ( display       diodeMask            blank      solid       yellow     yellow     )
- ( display       TFDmask              blank      solid       yellow     yellow     )
- ( display       TABmask              blank      solid       yellow     yellow     )
- ( display       metal3text           blank      solid       tan        tan        )
- ( display       PolyNwellCap         capID      solid       lime       yellow     )
- ( display       PolyPwellCap         capID      solid       brown      yellow     )
- ( display       M1PolyCap            capID      solid       blue       yellow     )
- ( display       M2M1Cap              capID      solid       magenta    yellow     )
-
-)
-
-
-; ----------------------------------------------------------------------------
-; ------ Display information for the display device 'psc' (Color PS). --------
-; ----------------------------------------------------------------------------
-drDefineColor(
-;( DisplayName   ColorName   Red   Green   Blue   Blink )
-;( -----------   ---------   ---   -----   ----   ----- )
- ( psc           white       255    255    255  )
- ( psc           silver      217    230    255  )
- ( psc           cream       255    255    204  )
- ( psc           pink        255    191    242  )
- ( psc           magenta     255    0      255  )
- ( psc           lime        0      255    0    )
- ( psc           tan         255    230    191  )
- ( psc           cyan        0      255    255  )
- ( psc           cadetBlue   57     191    255  )
- ( psc           yellow      255    255    0    )
- ( psc           orange      255    128    0    )
- ( psc           red         255    0      0    )
- ( psc           purple      153    0      230  )
- ( psc           green       0      204    102  )
- ( psc           brown       191    64     38   )
- ( psc           blue        0      0      255  )
- ( psc           slate       140    140    166  )
- ( psc           gold        217    204    0    )
- ( psc           maroon      230    31     13   )
- ( psc           violet      94     0      230  )
- ( psc           forest      38     140    107  )
- ( psc           chocolate   128    38     38   )
- ( psc           navy        51     51     153  )
- ( psc           black       0      0      0    )
- ( psc           winBack     224    224    224  )
- ( psc           winFore     128    0      0    )
- ( psc           winText     51     51     51   )
- ( psc           winColor1   166    166    166  )
- ( psc           winColor2   115    115    115  )
- ( psc           winColor3   189    204    204  )
- ( psc           winColor4   204    204    204  )
- ( psc           winColor5   199    199    199  )
- ( psc           lightpink   255    196    209  )
-)
-
-drDefineStipple(
-;( DisplayName   StippleName     Bitmap )
-;( -----------   -----------     ------ )
-
- ( psc          blank        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          solid        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psc          dots         (
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          hLine        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psc           hLine2       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psc          vLine        (
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                             ) )
- ( psc          cross        (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                             ) )
- ( psc          miniHatch    (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          grid         (
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psc          slash        (
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                             ) )
- ( psc          halfslash    (
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                             ) )
- ( psc          backSlash    (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                             ) )
- ( psc          hZigZag      (
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 1 0 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                             ) )
- ( psc          vZigZag      (
-                              (1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0)
-                              (1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1)
-                              (1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0)
-                              (1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1)
-                             ) )
- ( psc          rvZigZag     (
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                             ) )
- ( psc          hCurb        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1)
-                              (1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          vCurb        (
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0)
-                             ) )
- ( psc          brick        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                             ) )
- ( psc          dagger       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                             ) )
- ( psc          triangle     (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          x            (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                             ) )
- ( psc          dot1         (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          dot2         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          dot3         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          dot4         ( 
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          checker      (
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1)
-                             ) )
- ( psc          viap         (
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                             ) )
- ( psc          metal1S      (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1)
-                             ) )
- ( psc          metal2S      (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                             ) )
- ( psc          gnd2S        (
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                             ) )
- ( psc          vcc2S        (
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                             ) )
- ( psc          vcc1S        (
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                             ) )
- ( psc          poly2p       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 0 0 0 0)
-                              (0 0 1 0 0 1 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          contp        (
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          pplusp       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          wellp        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          checker1     (
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                             ) )
- ( psc          checker2     (
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                             ) )
- ( psc          invCross     (
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                              (0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1)
-                              (1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0)
-                             ) )
- ( psc          wellBp       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 0 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 0 1 1 0 0 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc          cwellBp      (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc         capID        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 1 1 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psc           resID        ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 1 1 1 0 1 0 0 1 1 1 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
- ( psc           diodeID      ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 1 1 1 1 0 0 0 1 1 1 1 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
-)
-
-drDefineLineStyle(
-;( DisplayName   LineStyle     Size    Pattern )
-;( -----------   ---------     ----    ------- )
- ( psc           solid          1      (1 1 1) )
- ( psc           dashed         1      (1 1 1 1 0 0) )
- ( psc           dots           1      (1 0 0) )
- ( psc           dashDot        1      (1 1 1 0 0 1 0 0) )
- ( psc           shortDash      1      (1 1 0 0) )
- ( psc           doubleDash     1      (1 1 1 1 0 0 1 1 0 0) )
- ( psc           hidden         1      (1 0 0 0) )
- ( psc           thickLine      3      (1 1 1) )
- ( psc           mLine          2      (1 1 1) )
- )
-
-drDefinePacket(
-;( DisplayName   PacketName           Stipple    LineStyle    Fill      Outline )
-;( -----------   ----------           -------    ---------    ----      ------- )
- ( psc           default              blank      solid       green      green      )
- ( psc           hdrcBnd              blank      solid       white      white      )
- ( psc           nwell                slash      solid       green      green      )
- ( psc           nwellNet             blank      solid       green      green      )
- ( psc           nwellPin             X          solid       green      green      )
- ( psc           pwell                slash      solid       orange     orange     )
- ( psc           pwellNet             blank      solid       orange     orange     )
- ( psc           pwellPin             X          solid       orange     orange     )
- ( psc           pbase                checker2   solid       orange     orange     )
- ( psc           pbaseNet             blank      solid       orange     orange     )
- ( psc           pbasePin             X          solid       orange     orange     )
- ( psc           active               invCross   solid       green      green      )
- ( psc           activeNet            blank      solid       green      green      )
- ( psc           activePin            X          solid       green      green      )
- ( psc           nimplant              blank      solid       green      green      )
- ( psc           pimplant              blank      solid       orange     orange     )
- ( psc           polycap              checker2   solid       lightpink  lightpink  )
- ( psc           polycapNet           blank      solid       lightpink  lightpink  )
- ( psc           polycapPin           X          solid       lightpink  lightpink  )
- ( psc           polycapLbl           blank      solid       lightpink  lightpink  )
- ( psc           polycapBnd           blank      solid       lightpink  lightpink  )
- ( psc           poly                 checker1   solid       red        red        )
- ( psc           polyNet              blank      solid       red        red        )
- ( psc           polyPin              X          solid       red        red        )
- ( psc           polyLbl              blank      solid       red        red        )
- ( psc           polyBnd              blank      solid       red        red        )
- ( psc           sblock               brick      solid       blue       blue       )
- ( psc           highres              resID      solid       blue       blue       )
- ( psc           elec                 checker2   solid       yellow     yellow     )
- ( psc           elecNet              blank      solid       yellow     yellow     )
- ( psc           elecPin              X          solid       yellow     yellow     )
- ( psc           elecLbl              blank      solid       yellow     yellow     )
- ( psc           metal1               backSlash  solid       blue       blue       )
- ( psc           metal1Net            blank      solid       blue       blue       )
- ( psc           metal1Pin            X          solid       blue       blue       )
- ( psc           metal1Lbl            blank      solid       blue       blue       )
- ( psc           metal1Bnd            blank      solid       blue       blue       )
- ( psc           contact              solid      solid       black      lime       )
- ( psc           contactNet           blank      solid       brown      brown      )
- ( psc           contactPin           X          solid       black      black      )
- ( psc           contactLbl           blank      solid       black      black      )
- ( psc           contactBnd           blank      solid       black      black      )
- ( psc           metal2               dots       solid       magenta    magenta    )
- ( psc           metal2Net            blank      solid       magenta    magenta    )
- ( psc           metal2Pin            X          solid       magenta    magenta    )
- ( psc           metal2Lbl            blank      solid       magenta    magenta    )
- ( psc           metal2Bnd            blank      solid       magenta    magenta    )
- ( psc           via1                 viap       solid       purple     black      )
- ( psc           via1Net              blank      solid       purple     black      )
- ( psc           via1Pin              X          solid       purple     black      )
- ( psc           via1Lbl              blank      solid       purple     black      )
- ( psc           viaBnd               blank      solid       purple     black      )
- ( psc           metal3               halfslash  solid       cyan       cyan       )
- ( psc           metal3Net            blank      solid       cyan       cyan       )
- ( psc           metal3Pin            X          solid       cyan       cyan       )
- ( psc           metal3Lbl            blank      solid       cyan       cyan       )
- ( psc           metal3Bnd            blank      solid       cyan       cyan       )
- ( psc           via2                 brick      solid       black      black      )
- ( psc           via2Net              blank      solid       black      black      )
- ( psc           via2Pin              X          solid       black      black      )
- ( psc           via2Lbl              blank      solid       black      black      )
- ( psc           via2Bnd              blank      solid       black      black      )
- ( psc           metal4               dot4       solid       cream      cream      )
- ( psc           metal4Net            blank      solid       cream      cream      )
- ( psc           metal4Pin            X          solid       cream      cream      )
- ( psc           metal4Lbl            blank      solid       cream      cream      )
- ( psc           metal4Bnd            blank      solid       cream      cream      )
- ( psc           via3                 invCross   solid       tan        tan        )
- ( psc           via3Net              blank      solid       tan        tan        )
- ( psc           via3Pin              X          solid       tan        tan        )
- ( psc           via3Lbl              blank      solid       tan        tan        )
- ( psc           via3Bnd              blank      solid       tan        tan        )
- ( psc           metal5               metal2S    solid       cadetBlue  cadetBlue  )
- ( psc           metal5Net            blank      solid       cadetBlue  cadetBlue  )
- ( psc           metal5Pin            X          solid       cadetBlue  cadetBlue  )
- ( psc           metal5Lbl            blank      solid       cadetBlue  cadetBlue  )
- ( psc           metal5Bnd            blank      solid       cadetBlue  cadetBlue  )
- ( psc           via4                 invCross   solid       blue       blue       )
- ( psc           via4Net              blank      solid       blue       blue       )
- ( psc           via4Pin              X          solid       blue       blue       )
- ( psc           via4Lbl              blank      solid       blue       blue       )
- ( psc           via4Bnd              blank      solid       blue       blue       )
- ( psc           metal6               miniHatch  solid       gold       gold       )
- ( psc           metal6Net            blank      solid       gold       gold       )
- ( psc           metal6Pin            X          solid       gold       gold       )
- ( psc           metal6Lbl            blank      solid       gold       gold       )
- ( psc           metal6Bnd            blank      solid       gold       gold       )
- ( psc           via5                 invCross   solid       yellow     yellow     )
- ( psc           via5Net              blank      solid       yellow     yellow     )
- ( psc           via5Pin              X          solid       yellow     yellow     )
- ( psc           via5Lbl              blank      solid       yellow     yellow     )
- ( psc           via5Bnd              blank      solid       yellow     yellow     )
- ( psc           metal7               dots       solid       maroon    maroon    )
- ( psc           metal7Net            blank      solid       maroon    maroon    )
- ( psc           metal7Pin            X          solid       maroon    maroon    )
- ( psc           metal7Lbl            blank      solid       maroon    maroon    )
- ( psc           metal7Bnd            blank      solid       maroon    maroon    )
- ( psc           via6                 invCross   solid       magenta   magenta     )
- ( psc           viaNet6              blank      solid       magenta   magenta     )
- ( psc           viaPin6              X          solid       magenta   magenta     ) 
- ( psc           viaLbl6              blank      solid       magenta   magenta     )
- ( psc           viaBnd6              blank      solid       magenta   magenta     ) 
- ( psc           metal8               halfslash  solid       cyan       cyan       )
- ( psc           metal8Net            blank      solid       cyan       cyan       )
- ( psc           metal8Pin            X          solid       cyan       cyan       )
- ( psc           metal8Lbl            blank      solid       cyan       cyan       )
- ( psc           metal8Bnd            blank      solid       cyan       cyan       )
- ( psc           via7                 invCross   solid       cadetBlue  cadetBlue  )
- ( psc           via7Net              blank      solid       cadetBlue  cadetBlue  )
- ( psc           via7Pin              X          solid       cadetBlue  cadetBlue  )
- ( psc           via7Lbl              blank      solid       cadetBlue  cadetBlue  )
- ( psc           via7Bnd              blank      solid       cadetBlue  cadetBlue  )
- ( psc           metal9               dot4       solid       cream      cream      )
- ( psc           metal9Net            blank      solid       cream      cream      )
- ( psc           metal9Pin            X          solid       cream      cream      )
- ( psc           metal9Lbl            blank      solid       cream      cream      )
- ( psc           metal9Bnd            blank      solid       cream      cream      )
- ( psc           via8                 invCross   solid       tan        tan        )
- ( psc           via8Net              blank      solid       tan        tan        )
- ( psc           via8Pin              X          solid       tan        tan        )
- ( psc           via8Lbl              blank      solid       tan        tan        )
- ( psc           via8Bnd              blank      solid       tan        tan        )
- ( psc           metal10              metal2S    solid       cadetBlue  cadetBlue  )
- ( psc           metal10Net           blank      solid       cadetBlue  cadetBlue  )
- ( psc           metal10Pin           X          solid       cadetBlue  cadetBlue  )
- ( psc           metal10Lbl           blank      solid       cadetBlue  cadetBlue  )
- ( psc           metal10Bnd           blank      solid       cadetBlue  cadetBlue  )
- ( psc           via9                 invCross   solid       blue       blue       )
- ( psc           via9Net              blank      solid       blue       blue       )
- ( psc           via9Pin              X          solid       blue       blue       )
- ( psc           via9Lbl              blank      solid       blue       blue       )
- ( psc           via9Bnd              blank      solid       blue       blue       )
- ( psc           metal11              miniHatch  solid       gold       gold       )
- ( psc           metal11Net           blank      solid       gold       gold       )
- ( psc           metal11Pin           X          solid       gold       gold       )
- ( psc           metal11Lbl           blank      solid       gold       gold       )
- ( psc           metal11Bnd           blank      solid       gold       gold       )
- ( psc           glass                vLine      solid       slate      slate      )
- ( psc           open                 vCurb      solid       violet     violet     )
- ( psc           openNet              blank      solid       violet     violet     )
- ( psc           openPin              X          solid       violet     violet     )
- ( psc           openLbl              blank      solid       violet     violet     )
- ( psc           openBnd              blank      solid       violet     violet     )
- ( psc           pstop                dagger     solid       maroon     maroon     )
- ( psc           pstopNet             blank      solid       maroon     maroon     )
- ( psc           pstopPin             X          solid       maroon     maroon     )
- ( psc           pstopLbl             blank      solid       maroon     maroon     )
- ( psc           pstopBnd             blank      solid       maroon     maroon     )
- ( psc           pad                  X          doubleDash  yellow     yellow     )
- ( psc           nodrc                X          doubleDash  cyan       cyan       )
- ( psc           nolpe                dot3       doubleDash  tan        tan        )
- ( psc           cap_id               capID      doubleDash  slate      slate      )
- ( psc           res_id               resID      doubleDash  slate      slate      )
- ( psc           dio_id               diodeID    doubleDash  slate      slate      )
- ( psc           metalcap             miniHatch  solid       violet     violet     )
- ( psc           metalcapBnd          miniHatch  solid       violet     violet     )
- ( psc           metalcapPin          X          solid       violet     violet     )
- ( psc           metalcapNet          blank      solid       violet     violet     )
- ( psc           metalcapLbl          blank      solid       violet     violet     )
- ( psc           background           solid      solid       black      black      )
- ( psc           grid                 blank      solid       slate      slate      )
- ( psc           grid1                blank      solid       white      white      )
- ( psc           axis                 blank      solid       white      white      )
- ( psc           instance             blank      solid       red        red        )
- ( psc           instanceLbl          blank      solid       gold       gold       )
- ( psc           prBoundary           blank      solid       purple     purple     )
- ( psc           prBoundaryBnd        blank      solid       cyan       cyan       )
- ( psc           prBoundaryLbl        blank      solid       purple     purple     )
- ( psc           align                blank      solid       tan        tan        )
- ( psc           hardFence            blank      solid       red        red        )
- ( psc           softFence            blank      solid       yellow     yellow     )
- ( psc           text                 blank      solid       white      white      )
- ( psc           text1                blank      dashed      white      white      )
- ( psc           text2                solid      solid       white      white      )
- ( psc           border               blank      solid       tan        tan        )
- ( psc           device               blank      solid       green      green      )
- ( psc           device2              blank      dashed      green      green      )
- ( psc           device1              solid      solid       green      green      )
- ( psc           wire                 solid      solid       cadetBlue  cadetBlue  )
- ( psc           wireLbl              solid      solid       cadetBlue  cadetBlue  )
- ( psc           wireFlt              blank      dashed      red        red        )
- ( psc           deviceAnt            blank      solid       yellow     yellow     )
- ( psc           deviceLbl            blank      solid       green      green      )
- ( psc           pinLbl               blank      solid       red        red        )
- ( psc           pin                  solid      solid       red        red        )
- ( psc           pinAnt               blank      solid       red        red        )
- ( psc           annotate             blank      solid       orange     orange     )
- ( psc           annotate1            blank      solid       pink       pink       )
- ( psc           annotate2            blank      solid       lime       lime       )
- ( psc           annotate3            blank      solid       cyan       cyan       )
- ( psc           annotate4            blank      solid       yellow     yellow     )
- ( psc           annotate5            blank      solid       white      white      )
- ( psc           annotate6            blank      solid       silver     silver     )
- ( psc           annotate7            blank      solid       red        red        )
- ( psc           annotate8            blank      solid       tan        tan        )
- ( psc           annotate9            blank      solid       green      green      )
- ( psc           edgeLayer            blank      solid       winColor5  winColor5  )
- ( psc           edgeLayerPin         blank      solid       yellow     yellow     )
- ( psc           snap                 blank      solid       yellow     yellow     )
- ( psc           stretch              blank      solid       yellow     yellow     )
- ( psc           y0                   blank      dashed      winColor5  winColor5  )
- ( psc           y1                   blank      dashed      brown      brown      )
- ( psc           y2                   blank      dashed      red        red        )
- ( psc           y3                   blank      dashed      pink       pink       )
- ( psc           y4                   blank      dashed      orange     orange     )
- ( psc           y5                   blank      dashed      green      green      )
- ( psc           y6                   blank      dashed      blue       blue       )
- ( psc           y7                   blank      dashed      purple     purple     )
- ( psc           y8                   blank      dashed      gold       gold       )
- ( psc           y9                   blank      dashed      silver     silver     )
- ( psc           hilite               blank      solid       white      white      )
- ( psc           hilite1              blank      solid       yellow     yellow     )
- ( psc           hilite2              blank      solid       tan        tan        )
- ( psc           hilite3              blank      solid       cyan       cyan       )
- ( psc           hilite4              blank      solid       orange     orange     )
- ( psc           hilite5              blank      solid       lime       lime       )
- ( psc           hilite6              blank      solid       orange     orange     )
- ( psc           hilite7              blank      solid       cream      cream      )
- ( psc           hilite8              blank      solid       magenta    magenta    )
- ( psc           hilite9              blank      solid       pink       pink       )
- ( psc          select               blank      solid       orange     orange     )
- ( psc           drive                blank      solid       blue       blue       )
- ( psc           hiz                  blank      solid       orange     orange     )
- ( psc           resist               blank      solid       cyan       cyan       )
- ( psc           spike                blank      solid       purple     purple     )
- ( psc           supply               blank      solid       lime       lime       )
- ( psc           unknown              blank      solid       yellow     yellow     )
- ( psc           unset                blank      solid       forest     forest     )
- ( psc           designFlow           solid      solid       green      green      )
- ( psc           designFlow1          solid      solid       red        red        )
- ( psc           designFlow2          solid      solid       purple     purple     )
- ( psc           designFlow3          solid      solid       pink       pink       )
- ( psc           designFlow4          solid      solid       black      black      )
- ( psc           designFlow5          solid      solid       silver     silver     )
- ( psc           designFlow6          solid      solid       tan        tan        )
- ( psc           designFlow7          solid      solid       cyan       cyan       )
- ( psc           designFlow8          solid      solid       navy       navy       )
- ( psc           designFlow9          solid      solid       orange     orange     )
- ( psc           changedLayerTl0      blank      solid       red        red        )
- ( psc           changedLayerTl1      blank      solid       yellow     yellow     )
- ( psc           markerWarn           X          solid       yellow     yellow     )
- ( psc           markerErr            X          solid       white      white      )
- ( psc           Row                  blank      solid       cyan       cyan       )
- ( psc           RowLbl               blank      solid       cyan       cyan       )
- ( psc           Group                dots       solid       green      green      )
- ( psc           GroupLbl             blank      solid       green      green      )
- ( psc           Cannotoccupy         X          solid       red        red        )
- ( psc           CannotoccupyBnd      blank      solid       red        red        )
- ( psc           Canplace             blank      solid       cyan       cyan       )
- ( psc           Unrouted             blank      dashed      winColor5  winColor5  )
- ( psc           Unrouted1            blank      dashed      brown      brown      )
- ( psc           Unrouted2            blank      dashed      red        red        )
- ( psc           Unrouted3            blank      dashed      pink       pink       )
- ( psc           Unrouted4            blank      dashed      orange     orange     )
- ( psc           Unrouted5            blank      dashed      green      green      )
- ( psc           Unrouted6            blank      dashed      blue       blue       )
- ( psc           Unrouted7            blank      dashed      purple     purple     )
- ( psc           Unrouted8            blank      dashed      gold       gold       )
- ( psc           Unrouted9            blank      dashed      silver     silver     )
-)
-
-
-; ------------------------------------------------------------------------
-; ------ Display information for the display device 'psb' (B+W PS). ------
-; ------------------------------------------------------------------------
-
-drDefineColor(
-;( DisplayName   ColorName   Red   Green   Blue   Blink )
-;( -----------   ---------   ---   -----   ----   ----- )
- ( psb           white       255    255    255  )
- ( psb           1           0      0      0    )
-)
-
-drDefineStipple(
-;( DisplayName   StippleName     Bitmap )
-;( -----------   -----------     ------ )
-
- ( psb          blank        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          solid        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psb          dots         (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          hLine        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb           hLine2       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psb          vLine        (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                             ) )
- ( psb          cross        (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 1 0 1 0 0 0 1 0 1)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 1 0 1 0 0 0 1 0 1 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 1 0 1 0 0 0 1 0 1 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 1 0 1 0 0 0 1 0 1 0 1 0 0 0 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 1 0 1 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 1 0 1 0 0 0 1 0 0 0 1)
-                             ) )
- ( psb          x            (
-                              (1 0 1 0 0 1 0 1 0 0 1 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 1 0 0 1 0 1 0 0 1 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 1 0 0 1 0 1 0 0 1 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 1 0 0 1 0 1 0 0 1 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 1 0 0 1 0 1 0 0 0 1 0 1 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0)
-                              (1 0 1 0 0 1 0 1 0 0 0 1 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          miniHatch    (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          grid         (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                             ) )
- ( psb          halfslash    (
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                             ) )
- ( psb          slash        (
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (0 1 0 0 1 0 0 1 1 0 1 0 0 1 0 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                             ) )
- ( psb          backSlash    (
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                              (0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0)
-                              (0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0)
-                              (1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1)
-                             ) )
- ( psb          hZigZag      (
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          vZigZag      (
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                              (0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0)
-                             ) )
- ( psb          rvZigZag     (
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1)
-                              (0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1)
-                              (0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0)
-                              (0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0)
-                              (0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0)
-                              (0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0)
-                              (0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0)
-                              (1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0)
-                             ) )
- ( psb          hCurb        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 0 0 0 1 1 1 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (1 1 1 1 0 0 1 1 1 1 1 0 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 0 0 0 1 1 1 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 1 0 0 0 1 0)
-                              (1 1 1 1 0 0 1 1 1 1 1 0 0 0 1 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          vCurb        (
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 1 1 1 1 0 0 0 1 1 1 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                             ) )
- ( psb          brick        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1)
-                             ) )
- ( psb          dagger       (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 1 1 1 1 1 0 0 0 1 1 1 1 1)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0)
-                             ) )
- ( psb          triangle     (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          dot1         (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          dot2         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          dot3         (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          checker      (
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                              (0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1)
-                             ) )
- ( psb          checker2     (
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (1 1 0 0 1 1 0 0 1 1 0 0 1 1 0 0)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                              (0 0 1 1 0 0 1 1 0 0 1 1 0 0 1 1)
-                             ) )
- ( psb          sgrid        (
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                              (1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1)
-                              (1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-                             ) )
- ( psb          metal1S      (
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                             ) )
- ( psb          metal2S      (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0)
-                              (0 0 0 0 1 1 1 1 1 1 1 1 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb          gnd2S        (
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (1 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 1 1 1 0 0 0 0 0 1 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                             ) )
- ( psb          vcc2S        (
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                              (0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 0)
-                              (0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 0)
-                              (0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0)
-                              (1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1)
-                              (1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0)
-                              (0 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0)
-                              (0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0)
-                             ) )
- ( psb          vcc1S        (
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                              (1 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0)
-                              (0 1 0 0 1 0 0 0 0 1 0 0 1 0 0 0)
-                              (0 0 1 0 0 1 1 0 0 0 1 0 0 1 1 0)
-                              (0 0 0 1 0 0 1 0 0 0 0 1 0 0 1 0)
-                              (1 0 0 0 1 0 0 1 1 0 0 0 1 0 0 1)
-                              (1 0 0 0 0 1 0 0 1 0 0 0 0 1 0 0)
-                              (0 1 1 0 0 0 1 0 0 1 1 0 0 0 1 0)
-                              (0 0 1 0 0 0 0 1 0 0 1 0 0 0 0 1)
-                             ) )
- ( psb          capID        (
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 1 1 1 1 1 1 1 1 1 1 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0)
-                              (0 0 0 0 1 0 0 1 1 0 0 1 0 0 0 0)
-                              (0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                              (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-                             ) )
- ( psb           resID        ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 1 1 1 0 1 0 0 1 1 1 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
- ( psb           diodeID      ( ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 1 1 1 1 0 0 0 1 1 1 1 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  )
-                                ( 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ) ) )
-)
-
-drDefineLineStyle(
-;( DisplayName   LineStyle     Size    Pattern )
-;( -----------   ---------     ----    ------- )
- ( psb           solid          1      (1 1 1) )
- ( psb           dashed         1      (1 1 1 1 0 0 0 0) )
- ( psb           dots           1      (1 0 0 0 0) )
- ( psb           dashDot        1      (1 1 1 1 0 0 0 0 1 0 0 0 0) )
- ( psb           shortDash      1      (1 1 0 0) )
- ( psb           doubleDash     1      (1 1 1 1 0 0 0 0 1 1 0 0) )
- ( psb           hidden         1      (1 0 0 0 0 0 0 0 0) )
- ( psb           thickLine      3      (1 1 1) )
- )
-
-drDefinePacket(
-;( DisplayName   PacketName           Stipple    LineStyle    Fill      Outline )
-;( -----------   ----------           -------    ---------    ----      ------- )
- ( psb           default              blank      solid       1          1          )
- ( psb           nwell                blank      solid       1          1          )
- ( psb           nwellNet             blank      solid       1          1          )
- ( psb           nwellPin             X          solid       1          1          )
- ( psb           pwell                dot1       solid       1          1          )
- ( psb           pwellNet             blank      solid       1          1          )
- ( psb           pwellPin             X          solid       1          1          )
- ( psb           pbase                blank      solid       1          1          )
- ( psb           pbaseNet             blank      solid       1          1          )
- ( psb           pbasePin             X          solid       1          1          )
- ( psb           active               dot3       solid       1          1          )
- ( psb           activeNet            blank      solid       1          1          )
- ( psb           activePin            X          solid       1          1          )
- ( psb           nimplant             blank      solid       1          1          )
- ( psb           pimplant             blank      doubleDash  1          1          )
- ( psb           polycap              checker2   solid       1          1          )
- ( psb           polycapNet           blank      solid       1          1          )
- ( psb           polycapPin           X          solid       1          1          )
- ( psb           polycapLbl           blank      solid       1          1          )
- ( psb           polycapBnd           blank      solid       1          1          )
- ( psb           poly                 checker    solid       1          1          )
- ( psb           polyNet              blank      solid       1          1          )
- ( psb           polyPin              X          solid       1          1          )
- ( psb           polyLbl              blank      solid       1          1          )
- ( psb           polyBnd              blank      solid       1          1          )
- ( psb           sblock               vCurb      solid       1          1          )
- ( psb           highres              vCurb      solid       1          1          )
- ( psb           elec                 dagger     solid       1          1          )
- ( psb           elecNet              blank      solid       1          1          )
- ( psb           elecPin              X          solid       1          1          )
- ( psb           elecLbl              blank      solid       1          1          )
- ( psb           metal1               metal1S    thickLine   1          1          )
- ( psb           metal1Net            blank      solid       1          1          )
- ( psb           metal1Pin            X          solid       1          1          )
- ( psb           metal1Lbl            blank      solid       1          1          )
- ( psb           metal1Bnd            blank      solid       1          1          )
- ( psb           contact              solid      solid       1          1          )
- ( psb           contactNet           blank      solid       1          1          )
- ( psb           contactPin           X          solid       1          1          )
- ( psb           contactLbl           blank      solid       1          1          )
- ( psb           contactBnd           blank      solid       1          1          )
- ( psb           metal2               metal2S    thickLine   1          1          )
- ( psb           metal2Net            blank      solid       1          1          )
- ( psb           metal2Pin            X          solid       1          1          )
- ( psb           metal2Lbl            blank      solid       1          1          )
- ( psb           metal2Bnd            blank      solid       1          1          )
- ( psb           metal3               halfslash  thickLine   1          1          )
- ( psb           metal3Net            blank      solid       1          1          )
- ( psb           metal3Pin            X          solid       1          1          )
- ( psb           metal3Lbl            blank      solid       1          1          )
- ( psb           metal3Bnd            blank      solid       1          1          )
- ( psb           via2                 dot1       thickLine   1          1          )
- ( psb           via2Net              blank      solid       1          1          )
- ( psb           via2Pin              X          solid       1          1          )
- ( psb           via2Lbl              blank      solid       1          1          )
- ( psb           via2Bnd              blank      solid       1          1          )
- ( psb           metal4               hCurb      thickLine   1          1          )
- ( psb           metal4Net            blank      solid       1          1          )
- ( psb           metal4Pin            X          solid       1          1          )
- ( psb           metal4Lbl            blank      solid       1          1          )
- ( psb           metal4Bnd            blank      solid       1          1          )
- ( psb           via3                 triangle   thickLine   1          1          )
- ( psb           via3Net              blank      solid       1          1          )
- ( psb           via3Pin              X          solid       1          1          )
- ( psb           via3Lbl              blank      solid       1          1          )
- ( psb           via3Bnd              blank      solid       1          1          )
- ( psb           metal5               hLine2     thickLine   1          1          )
- ( psb           metal5Net            blank      solid       1          1          )
- ( psb           metal5Pin            X          solid       1          1          )
- ( psb           metal5Lbl            blank      solid       1          1          )
- ( psb           metal5Bnd            blank      solid       1          1          )
- ( psb           via4                 dagger     thickLine   1          1          )
- ( psb           via4Net              blank      solid       1          1          )
- ( psb           via4Pin              X          solid       1          1          )
- ( psb           via4Lbl              blank      solid       1          1          )
- ( psb           via4Bnd              blank      solid       1          1          )
- ( psb           metal6               miniHatch  solid       1          1          )
- ( psb           metal6Net            blank      solid       1          1          )
- ( psb           metal6Pin            X          solid       1          1          )
- ( psb           metal6Lbl            blank      solid       1          1          )
- ( psb           metal6Bnd            blank      solid       1          1          )
- ( psb           via5                 dot2       solid       1          1          )
- ( psb           via5Net              blank      solid       1          1          )
- ( psb           via5Pin              X          solid       1          1          )
- ( psb           via5Lbl              blank      solid       1          1          )
- ( psb           via5Bnd              blank      solid       1          1          )
- ( psb           metal7               dots       solid       1          1    )
- ( psb           metal7Net            blank      solid       1          1    )
- ( psb           metal7Pin            X          solid       1          1    )
- ( psb           metal7Lbl            blank      solid       1          1    )
- ( psb           metal7Bnd            blank      solid       1          1    )
- ( psb           via6                 dot2       solid       1          1     )
- ( psb           viaNet6              blank      solid       1          1     )
- ( psb           viaPin6              X          solid       1          1     ) 
- ( psb           viaLbl6              blank      solid       1          1     )
- ( psb           viaBnd6              blank      solid       1          1     ) 
- ( psb           metal8               halfslash  solid       1          1       )
- ( psb           metal8Net            blank      solid       1          1       )
- ( psb           metal8Pin            X          solid       1          1       )
- ( psb           metal8Lbl            blank      solid       1          1       )
- ( psb           metal8Bnd            blank      solid       1          1       )
- ( psb           via7                 dot2       solid       1          1  )
- ( psb           via7Net              blank      solid       1          1  )
- ( psb           via7Pin              X          solid       1          1  )
- ( psb           via7Lbl              blank      solid       1          1  )
- ( psb           via7Bnd              blank      solid       1          1  )
- ( psb           metal9               dot2       solid       1          1      )
- ( psb           metal9Net            blank      solid       1          1      )
- ( psb           metal9Pin            X          solid       1          1      )
- ( psb           metal9Lbl            blank      solid       1          1      )
- ( psb           metal9Bnd            blank      solid       1          1      )
- ( psb           via8                 dot2       solid       1          1        )
- ( psb           via8Net              blank      solid       1          1        )
- ( psb           via8Pin              X          solid       1          1        )
- ( psb           via8Lbl              blank      solid       1          1        )
- ( psb           via8Bnd              blank      solid       1          1        )
- ( psb           metal10              metal2S    solid       1          1  )
- ( psb           metal10Net           blank      solid       1          1  )
- ( psb           metal10Pin           X          solid       1          1  )
- ( psb           metal10Lbl           blank      solid       1          1  )
- ( psb           metal10Bnd           blank      solid       1          1  )
- ( psb           via9                 dot2       solid       1          1       )
- ( psb           via9Net              blank      solid       1          1       )
- ( psb           via9Pin              X          solid       1          1       )
- ( psb           via9Lbl              blank      solid       1          1       )
- ( psb           via9Bnd              blank      solid       1          1       )
- ( psb           metal11              miniHatch  solid       1          1       )
- ( psb           metal11Net           blank      solid       1          1       )
- ( psb           metal11Pin           X          solid       1          1       )
- ( psb           metal11Lbl           blank      solid       1          1       )
- ( psb           metal11Bnd           blank      solid       1          1       )
-
-
-
-
- ( psb           glass                blank      solid       1          1          )
- ( psb           open                 vCurb      solid       1          1          )
- ( psb           openNet              blank      solid       1          1          )
- ( psb           openPin              blank      solid       1          1          )
- ( psb           openLbl              blank      solid       1          1          )
- ( psb           openBnd              blank      solid       1          1          )
- ( psb           pstop                dagger     solid       1          1          )
- ( psb           pstopNet             blank      solid       1          1          )
- ( psb           pstopPin             X          solid       1          1          )
- ( psb           pstopLbl             blank      solid       1          1          )
- ( psb           pstopBnd             blank      solid       1          1          )
- ( psb           pad                  X          doubleDash  1          1          )
- ( psb           nodrc                X          doubleDash  1          1          )
- ( psb           cap_id               capID      doubleDash  1          1          )
- ( psb           res_id               resID      doubleDash  1          1          )
- ( psb           dio_id               diodeID    doubleDash  1          1          )
- ( psb           metalcap             miniHatch  solid       1          1          )
- ( psb           metalcapBnd          miniHatch  solid       1          1          )
- ( psb           metalcapPin          X          solid       1          1          )
- ( psb           metalcapNet          blank      solid       1          1          )
- ( psb           metalcapLbl          blank      solid       1          1          )
- ( psb           background           solid      solid       1          1          )
- ( psb           grid                 blank      solid       1          1          )
- ( psb           grid1                blank      solid       1          1          )
- ( psb           axis                 blank      solid       1          1          )
- ( psb           instance             blank      solid       1          1          )
- ( psb           instanceLbl          blank      solid       1          1          )
- ( psb           prBoundary           blank      solid       1          1          )
- ( psb           prBoundaryBnd        blank      solid       1          1          )
- ( psb           align                blank      solid       1          1          )
- ( psb           text                 blank      solid       1          1          )
- ( psb           text1                blank      solid       1          1          )
- ( psb           text2                solid      solid       1          1          )
- ( psb           border               solid      solid       1          1          )
- ( psb           device               blank      solid       1          1          )
- ( psb           device1              blank      solid       1          1          )
- ( psb           wire                 solid      solid       1          1          )
- ( psb           wireLbl              solid      solid       1          1          )
- ( psb           wireFlt              blank      solid       1          1          )
- ( psb           deviceAnt            blank      solid       1          1          )
- ( psb           deviceLbl            blank      solid       1          1          )
- ( psb           pinLbl               blank      solid       1          1          )
- ( psb           pin                  solid      solid       1          1          )
- ( psb           pinAnt               blank      solid       1          1          )
- ( psb           annotate             blank      solid       1          1          )
- ( psb           annotate1            blank      solid       1          1          )
- ( psb           annotate2            blank      solid       1          1          )
- ( psb           annotate3            blank      solid       1          1          )
- ( psb           annotate4            blank      solid       1          1          )
- ( psb           annotate5            blank      solid       1          1          )
- ( psb           annotate6            blank      solid       1          1          )
- ( psb           annotate7            blank      solid       1          1          )
- ( psb           annotate8            blank      solid       1          1          )
- ( psb           annotate9            blank      solid       1          1          )
- ( psb           edgeLayer            blank      solid       1          1          )
- ( psb           edgeLayerPin         blank      solid       1          1          )
- ( psb           snap                 blank      solid       1          1          )
- ( psb           stretch              blank      solid       1          1          )
- ( psb           y0                   blank      solid       1          1          )
- ( psb           y1                   blank      dashed      1          1          )
- ( psb           y2                   blank      dots        1          1          )
- ( psb           y3                   blank      dashDot     1          1          )
- ( psb           y4                   blank      shortDash   1          1          )
- ( psb           y5                   blank      doubleDash  1          1          )
- ( psb           y6                   blank      hidden      1          1          )
- ( psb           y7                   blank      thickLine   1          1          )
- ( psb           y8                   blank      solid       1          1          )
- ( psb           y9                   hLine      dashed      1          1          )
- ( psb           hilite               blank      solid       1          1          )
- ( psb           hilite1              blank      solid       1          1          )
- ( psb           hilite2              blank      solid       1          1          )
- ( psb           hilite3              blank      solid       1          1          )
- ( psb           hilite4              blank      solid       1          1          )
- ( psb           hilite5              blank      solid       1          1          )
- ( psb           hilite6              blank      solid       1          1          )
- ( psb           hilite7              blank      solid       1          1          )
- ( psb           hilite8              blank      solid       1          1          )
- ( psb           hilite9              blank      solid       1          1          )
- ( psb          select               blank      solid       1          1          )
- ( psb           drive                blank      solid       1          1          )
- ( psb           hiz                  blank      solid       1          1          )
- ( psb           resist               blank      solid       1          1          )
- ( psb           spike                blank      solid       1          1          )
- ( psb           supply               blank      solid       1          1          )
- ( psb           designFlow           solid      solid       1          1          )
- ( psb           designFlow1          blank      solid       1          1          )
- ( psb           designFlow2          blank      solid       1          1          )
- ( psb           designFlow3          blank      solid       1          1          )
- ( psb           designFlow4          blank      solid       1          1          )
- ( psb           designFlow5          blank      solid       1          1          )
- ( psb           designFlow6          blank      solid       1          1          )
- ( psb           designFlow7          blank      solid       1          1          )
- ( psb           designFlow8          blank      solid       1          1          )
- ( psb           designFlow9          blank      solid       1          1          )
- ( psb           changedLayerTl0      blank      solid       1          1          )
- ( psb           changedLayerTl1      blank      solid       1          1          )
- ( psb           markerWarn           X          solid       1          1          )
- ( psb           markerErr            X          solid       1          1          )
-)
-
-; vim:ts=4:columns=132:
diff --git a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/lib.defs b/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/lib.defs
deleted file mode 100644
index cfeaa2fe..00000000
--- a/crlcore/src/ccore/openaccess/testParser/NangateOpenCellFreePDK45/lib.defs
+++ /dev/null
@@ -1,4 +0,0 @@
-DEFINE NCSU_FreePDK_45nm NCSU_FreePDK_45nm
-ASSIGN NCSU_FreePDK_45nm libMode shared
-DEFINE NangateOpenCellLibrary NangateOpenCellLibrary
-ASSIGN NangateOpenCellLibrary libMode shared