Subcircuit libs cleanup

25 files changed, 343 insertions, 894 deletions

diff --git a/Examples/plot_data_i.txt b/Examples/plot_data_i.txt
deleted file mode 100644
index cc8b2dd9..00000000
--- a/Examples/plot_data_i.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-  * /home/fossee/esim-workspace/zener_characteristic/zener_characteristic.cir
-  DC transfer characteristic  Wed Mar 11 16:54:16  2020
---------------------------------------------------------------------------------
-Index   v-sweep         v1#branch       v_u2#branch     
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	0.000000e+00	
-1	5.000000e-02	-8.92890e-09	8.928900e-09	
-2	1.000000e-01	-1.78551e-08	1.785509e-08	
-3	1.500000e-01	-2.67820e-08	2.678195e-08	
-4	2.000000e-01	-3.57089e-08	3.570891e-08	
-5	2.500000e-01	-4.46359e-08	4.463589e-08	
-6	3.000000e-01	-5.35629e-08	5.356288e-08	
-7	3.500000e-01	-6.24899e-08	6.248986e-08	
-8	4.000000e-01	-7.14168e-08	7.141684e-08	
-9	4.500000e-01	-8.03438e-08	8.034382e-08	
-10	5.000000e-01	-8.92708e-08	8.927080e-08	
-11	5.500000e-01	-9.81978e-08	9.819779e-08	
-12	6.000000e-01	-1.07125e-07	1.071248e-07	
-13	6.500000e-01	-1.16052e-07	1.160518e-07	
-14	7.000000e-01	-1.24979e-07	1.249787e-07	
-15	7.500000e-01	-1.33906e-07	1.339057e-07	
-16	8.000000e-01	-1.42833e-07	1.428327e-07	
-17	8.500000e-01	-1.51760e-07	1.517597e-07	
-18	9.000000e-01	-1.60687e-07	1.606867e-07	
-19	9.500000e-01	-1.69614e-07	1.696136e-07	
-20	1.000000e+00	-1.78541e-07	1.785406e-07	
-21	1.050000e+00	-1.87468e-07	1.874676e-07	
-22	1.100000e+00	-1.96395e-07	1.963946e-07	
-23	1.150000e+00	-2.05322e-07	2.053216e-07	
-24	1.200000e+00	-2.14249e-07	2.142486e-07	
-25	1.250000e+00	-2.23176e-07	2.231755e-07	
-26	1.300000e+00	-2.32103e-07	2.321025e-07	
-27	1.350000e+00	-2.41030e-07	2.410295e-07	
-28	1.400000e+00	-2.49956e-07	2.499565e-07	
-29	1.450000e+00	-2.58883e-07	2.588835e-07	
-30	1.500000e+00	-2.67810e-07	2.678105e-07	
-31	1.550000e+00	-2.76737e-07	2.767374e-07	
-32	1.600000e+00	-2.85664e-07	2.856644e-07	
-33	1.650000e+00	-2.94591e-07	2.945914e-07	
-34	1.700000e+00	-3.03518e-07	3.035184e-07	
-35	1.750000e+00	-3.12445e-07	3.124454e-07	
-36	1.800000e+00	-3.21372e-07	3.213723e-07	
-37	1.850000e+00	-3.30299e-07	3.302993e-07	
-38	1.900000e+00	-3.39226e-07	3.392263e-07	
-39	1.950000e+00	-3.48153e-07	3.481533e-07	
-40	2.000000e+00	-3.57080e-07	3.570803e-07	
-41	2.050000e+00	-3.66007e-07	3.660073e-07	
-42	2.100000e+00	-3.74934e-07	3.749342e-07	
-43	2.150000e+00	-3.83861e-07	3.838612e-07	
-44	2.200000e+00	-3.92788e-07	3.927882e-07	
-45	2.250000e+00	-4.01715e-07	4.017152e-07	
-46	2.300000e+00	-4.10642e-07	4.106422e-07	
-47	2.350000e+00	-4.19569e-07	4.195692e-07	
-48	2.400000e+00	-4.28496e-07	4.284961e-07	
-49	2.450000e+00	-4.37423e-07	4.374231e-07	
-50	2.500000e+00	-4.46350e-07	4.463501e-07	
-51	2.550000e+00	-4.55277e-07	4.552771e-07	
-52	2.600000e+00	-4.64204e-07	4.642041e-07	
-53	2.650000e+00	-4.73131e-07	4.731310e-07	
-54	2.700000e+00	-4.82058e-07	4.820580e-07	
-
-Index   v-sweep         v1#branch       v_u2#branch     
---------------------------------------------------------------------------------
-55	2.750000e+00	-4.90985e-07	4.909850e-07	
-56	2.800000e+00	-4.99912e-07	4.999120e-07	
-57	2.850000e+00	-5.08839e-07	5.088390e-07	
-58	2.900000e+00	-5.17766e-07	5.177660e-07	
-59	2.950000e+00	-5.26693e-07	5.266929e-07	
-60	3.000000e+00	-5.35620e-07	5.356199e-07	
-61	3.050000e+00	-5.44547e-07	5.445469e-07	
-62	3.100000e+00	-5.53474e-07	5.534739e-07	
-63	3.150000e+00	-5.62401e-07	5.624009e-07	
-64	3.200000e+00	-5.71328e-07	5.713279e-07	
-65	3.250000e+00	-5.80255e-07	5.802548e-07	
-66	3.300000e+00	-5.89182e-07	5.891818e-07	
-67	3.350000e+00	-5.98109e-07	5.981088e-07	
-68	3.400000e+00	-6.07036e-07	6.070358e-07	
-69	3.450000e+00	-6.15963e-07	6.159628e-07	
-70	3.500000e+00	-6.24890e-07	6.248897e-07	
-71	3.550000e+00	-6.33817e-07	6.338167e-07	
-72	3.600000e+00	-6.42744e-07	6.427437e-07	
-73	3.650000e+00	-6.51671e-07	6.516707e-07	
-74	3.700000e+00	-6.60598e-07	6.605977e-07	
-75	3.750000e+00	-6.69525e-07	6.695247e-07	
-76	3.800000e+00	-6.78452e-07	6.784516e-07	
-77	3.850000e+00	-6.87379e-07	6.873786e-07	
-78	3.900000e+00	-6.96306e-07	6.963056e-07	
-79	3.950000e+00	-7.05233e-07	7.052326e-07	
-80	4.000000e+00	-7.14160e-07	7.141596e-07	
-81	4.050000e+00	-7.23087e-07	7.230865e-07	
-82	4.100000e+00	-7.32014e-07	7.320135e-07	
-83	4.150000e+00	-7.40941e-07	7.409405e-07	
-84	4.200000e+00	-7.49867e-07	7.498675e-07	
-85	4.250000e+00	-7.58794e-07	7.587945e-07	
-86	4.300000e+00	-7.67721e-07	7.677215e-07	
-87	4.350000e+00	-7.76648e-07	7.766484e-07	
-88	4.400000e+00	-7.85575e-07	7.855754e-07	
-89	4.450000e+00	-7.94502e-07	7.945024e-07	
-90	4.500000e+00	-8.03429e-07	8.034294e-07	
-91	4.550000e+00	-8.12356e-07	8.123564e-07	
-92	4.600000e+00	-8.21283e-07	8.212834e-07	
-93	4.650000e+00	-8.30210e-07	8.302103e-07	
-94	4.700000e+00	-8.39137e-07	8.391373e-07	
-95	4.750000e+00	-8.48064e-07	8.480643e-07	
-96	4.800000e+00	-8.56991e-07	8.569913e-07	
-97	4.850000e+00	-8.65918e-07	8.659183e-07	
-98	4.900000e+00	-8.74845e-07	8.748452e-07	
-99	4.950000e+00	-8.83772e-07	8.837722e-07	
-100	5.000000e+00	-8.92699e-07	8.926992e-07	
-101	5.050000e+00	-9.01626e-07	9.016262e-07	
-102	5.100000e+00	-9.10553e-07	9.105532e-07	
-103	5.150000e+00	-9.19481e-07	9.194811e-07	
-104	5.200000e+00	-9.28418e-07	9.284184e-07	
-105	5.250000e+00	-9.37472e-07	9.374718e-07	
-106	5.300000e+00	-9.52094e-07	9.520937e-07	
-107	5.350000e+00	-1.02598e-06	1.025981e-06	
-108	5.400000e+00	-1.79372e-06	1.793717e-06	
-109	5.450000e+00	-8.28243e-06	8.282435e-06	
-110	5.500000e+00	-3.04003e-05	3.040031e-05	
-111	5.550000e+00	-6.49097e-05	6.490970e-05	
-112	5.600000e+00	-1.05055e-04	1.050546e-04	
-
-Index   v-sweep         v1#branch       v_u2#branch     
---------------------------------------------------------------------------------
-113	5.650000e+00	-1.48201e-04	1.482015e-04	
-114	5.700000e+00	-1.92916e-04	1.929158e-04	
-115	5.750000e+00	-2.38648e-04	2.386478e-04	
-116	5.800000e+00	-2.85081e-04	2.850811e-04	
-117	5.850000e+00	-3.31795e-04	3.317953e-04	
-118	5.900000e+00	-3.79206e-04	3.792058e-04	
-119	5.950000e+00	-4.26859e-04	4.268592e-04	
-120	6.000000e+00	-4.74752e-04	4.747517e-04	
-121	6.050000e+00	-5.22836e-04	5.228359e-04	
-122	6.100000e+00	-5.71081e-04	5.710810e-04	
-123	6.150000e+00	-6.19462e-04	6.194625e-04	
-124	6.200000e+00	-6.67961e-04	6.679611e-04	
-125	6.250000e+00	-7.16561e-04	7.165613e-04	
-126	6.300000e+00	-7.65250e-04	7.652504e-04	
-127	6.350000e+00	-8.14018e-04	8.140179e-04	
-128	6.400000e+00	-8.62855e-04	8.628552e-04	
-129	6.450000e+00	-9.11755e-04	9.117548e-04	
-130	6.500000e+00	-9.60711e-04	9.607105e-04	
-131	6.550000e+00	-1.00972e-03	1.009717e-03	
-132	6.600000e+00	-1.05877e-03	1.058769e-03	
-133	6.650000e+00	-1.10786e-03	1.107864e-03	
-134	6.700000e+00	-1.15700e-03	1.156997e-03	
-135	6.750000e+00	-1.20617e-03	1.206165e-03	
-136	6.800000e+00	-1.25537e-03	1.255366e-03	
-137	6.850000e+00	-1.30460e-03	1.304598e-03	
-138	6.900000e+00	-1.35386e-03	1.353857e-03	
-139	6.950000e+00	-1.40314e-03	1.403142e-03	
-140	7.000000e+00	-1.45245e-03	1.452452e-03	
-141	7.050000e+00	-1.50178e-03	1.501784e-03	
-142	7.100000e+00	-1.55114e-03	1.551137e-03	
-143	7.150000e+00	-1.60051e-03	1.600511e-03	
-144	7.200000e+00	-1.64990e-03	1.649903e-03	
-145	7.250000e+00	-1.69931e-03	1.699313e-03	
-146	7.300000e+00	-1.74874e-03	1.748740e-03	
-147	7.350000e+00	-1.79818e-03	1.798183e-03	
-148	7.400000e+00	-1.84764e-03	1.847640e-03	
-149	7.450000e+00	-1.89711e-03	1.897112e-03	
-150	7.500000e+00	-1.94660e-03	1.946597e-03	
-151	7.550000e+00	-1.99609e-03	1.996095e-03	
-152	7.600000e+00	-2.04560e-03	2.045605e-03	
-153	7.650000e+00	-2.09513e-03	2.095126e-03	
-154	7.700000e+00	-2.14466e-03	2.144659e-03	
-155	7.750000e+00	-2.19420e-03	2.194202e-03	
-156	7.800000e+00	-2.24376e-03	2.243756e-03	
-157	7.850000e+00	-2.29332e-03	2.293319e-03	
-158	7.900000e+00	-2.34289e-03	2.342891e-03	
-159	7.950000e+00	-2.39247e-03	2.392472e-03	
-160	8.000000e+00	-2.44206e-03	2.442062e-03	
diff --git a/Examples/plot_data_v.txt b/Examples/plot_data_v.txt
deleted file mode 100644
index dc3875b1..00000000
--- a/Examples/plot_data_v.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-  * /home/fossee/esim-workspace/zener_characteristic/zener_characteristic.cir
-  DC transfer characteristic  Wed Mar 11 16:54:16  2020
---------------------------------------------------------------------------------
-Index   v-sweep         in              net-_r1-pad2_   out             
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	0.000000e+00	0.000000e+00	
-1	5.000000e-02	5.000000e-02	4.999107e-02	4.999107e-02	
-2	1.000000e-01	1.000000e-01	9.998214e-02	9.998214e-02	
-3	1.500000e-01	1.500000e-01	1.499732e-01	1.499732e-01	
-4	2.000000e-01	2.000000e-01	1.999643e-01	1.999643e-01	
-5	2.500000e-01	2.500000e-01	2.499554e-01	2.499554e-01	
-6	3.000000e-01	3.000000e-01	2.999464e-01	2.999464e-01	
-7	3.500000e-01	3.500000e-01	3.499375e-01	3.499375e-01	
-8	4.000000e-01	4.000000e-01	3.999286e-01	3.999286e-01	
-9	4.500000e-01	4.500000e-01	4.499197e-01	4.499197e-01	
-10	5.000000e-01	5.000000e-01	4.999107e-01	4.999107e-01	
-11	5.500000e-01	5.500000e-01	5.499018e-01	5.499018e-01	
-12	6.000000e-01	6.000000e-01	5.998929e-01	5.998929e-01	
-13	6.500000e-01	6.500000e-01	6.498839e-01	6.498839e-01	
-14	7.000000e-01	7.000000e-01	6.998750e-01	6.998750e-01	
-15	7.500000e-01	7.500000e-01	7.498661e-01	7.498661e-01	
-16	8.000000e-01	8.000000e-01	7.998572e-01	7.998572e-01	
-17	8.500000e-01	8.500000e-01	8.498482e-01	8.498482e-01	
-18	9.000000e-01	9.000000e-01	8.998393e-01	8.998393e-01	
-19	9.500000e-01	9.500000e-01	9.498304e-01	9.498304e-01	
-20	1.000000e+00	1.000000e+00	9.998215e-01	9.998215e-01	
-21	1.050000e+00	1.050000e+00	1.049813e+00	1.049813e+00	
-22	1.100000e+00	1.100000e+00	1.099804e+00	1.099804e+00	
-23	1.150000e+00	1.150000e+00	1.149795e+00	1.149795e+00	
-24	1.200000e+00	1.200000e+00	1.199786e+00	1.199786e+00	
-25	1.250000e+00	1.250000e+00	1.249777e+00	1.249777e+00	
-26	1.300000e+00	1.300000e+00	1.299768e+00	1.299768e+00	
-27	1.350000e+00	1.350000e+00	1.349759e+00	1.349759e+00	
-28	1.400000e+00	1.400000e+00	1.399750e+00	1.399750e+00	
-29	1.450000e+00	1.450000e+00	1.449741e+00	1.449741e+00	
-30	1.500000e+00	1.500000e+00	1.499732e+00	1.499732e+00	
-31	1.550000e+00	1.550000e+00	1.549723e+00	1.549723e+00	
-32	1.600000e+00	1.600000e+00	1.599714e+00	1.599714e+00	
-33	1.650000e+00	1.650000e+00	1.649705e+00	1.649705e+00	
-34	1.700000e+00	1.700000e+00	1.699696e+00	1.699696e+00	
-35	1.750000e+00	1.750000e+00	1.749688e+00	1.749688e+00	
-36	1.800000e+00	1.800000e+00	1.799679e+00	1.799679e+00	
-37	1.850000e+00	1.850000e+00	1.849670e+00	1.849670e+00	
-38	1.900000e+00	1.900000e+00	1.899661e+00	1.899661e+00	
-39	1.950000e+00	1.950000e+00	1.949652e+00	1.949652e+00	
-40	2.000000e+00	2.000000e+00	1.999643e+00	1.999643e+00	
-41	2.050000e+00	2.050000e+00	2.049634e+00	2.049634e+00	
-42	2.100000e+00	2.100000e+00	2.099625e+00	2.099625e+00	
-43	2.150000e+00	2.150000e+00	2.149616e+00	2.149616e+00	
-44	2.200000e+00	2.200000e+00	2.199607e+00	2.199607e+00	
-45	2.250000e+00	2.250000e+00	2.249598e+00	2.249598e+00	
-46	2.300000e+00	2.300000e+00	2.299589e+00	2.299589e+00	
-47	2.350000e+00	2.350000e+00	2.349580e+00	2.349580e+00	
-48	2.400000e+00	2.400000e+00	2.399572e+00	2.399572e+00	
-49	2.450000e+00	2.450000e+00	2.449563e+00	2.449563e+00	
-50	2.500000e+00	2.500000e+00	2.499554e+00	2.499554e+00	
-51	2.550000e+00	2.550000e+00	2.549545e+00	2.549545e+00	
-52	2.600000e+00	2.600000e+00	2.599536e+00	2.599536e+00	
-53	2.650000e+00	2.650000e+00	2.649527e+00	2.649527e+00	
-54	2.700000e+00	2.700000e+00	2.699518e+00	2.699518e+00	
-
-Index   v-sweep         in              net-_r1-pad2_   out             
---------------------------------------------------------------------------------
-55	2.750000e+00	2.750000e+00	2.749509e+00	2.749509e+00	
-56	2.800000e+00	2.800000e+00	2.799500e+00	2.799500e+00	
-57	2.850000e+00	2.850000e+00	2.849491e+00	2.849491e+00	
-58	2.900000e+00	2.900000e+00	2.899482e+00	2.899482e+00	
-59	2.950000e+00	2.950000e+00	2.949473e+00	2.949473e+00	
-60	3.000000e+00	3.000000e+00	2.999464e+00	2.999464e+00	
-61	3.050000e+00	3.050000e+00	3.049455e+00	3.049455e+00	
-62	3.100000e+00	3.100000e+00	3.099447e+00	3.099447e+00	
-63	3.150000e+00	3.150000e+00	3.149438e+00	3.149438e+00	
-64	3.200000e+00	3.200000e+00	3.199429e+00	3.199429e+00	
-65	3.250000e+00	3.250000e+00	3.249420e+00	3.249420e+00	
-66	3.300000e+00	3.300000e+00	3.299411e+00	3.299411e+00	
-67	3.350000e+00	3.350000e+00	3.349402e+00	3.349402e+00	
-68	3.400000e+00	3.400000e+00	3.399393e+00	3.399393e+00	
-69	3.450000e+00	3.450000e+00	3.449384e+00	3.449384e+00	
-70	3.500000e+00	3.500000e+00	3.499375e+00	3.499375e+00	
-71	3.550000e+00	3.550000e+00	3.549366e+00	3.549366e+00	
-72	3.600000e+00	3.600000e+00	3.599357e+00	3.599357e+00	
-73	3.650000e+00	3.650000e+00	3.649348e+00	3.649348e+00	
-74	3.700000e+00	3.700000e+00	3.699339e+00	3.699339e+00	
-75	3.750000e+00	3.750000e+00	3.749330e+00	3.749330e+00	
-76	3.800000e+00	3.800000e+00	3.799322e+00	3.799322e+00	
-77	3.850000e+00	3.850000e+00	3.849313e+00	3.849313e+00	
-78	3.900000e+00	3.900000e+00	3.899304e+00	3.899304e+00	
-79	3.950000e+00	3.950000e+00	3.949295e+00	3.949295e+00	
-80	4.000000e+00	4.000000e+00	3.999286e+00	3.999286e+00	
-81	4.050000e+00	4.050000e+00	4.049277e+00	4.049277e+00	
-82	4.100000e+00	4.100000e+00	4.099268e+00	4.099268e+00	
-83	4.150000e+00	4.150000e+00	4.149259e+00	4.149259e+00	
-84	4.200000e+00	4.200000e+00	4.199250e+00	4.199250e+00	
-85	4.250000e+00	4.250000e+00	4.249241e+00	4.249241e+00	
-86	4.300000e+00	4.300000e+00	4.299232e+00	4.299232e+00	
-87	4.350000e+00	4.350000e+00	4.349223e+00	4.349223e+00	
-88	4.400000e+00	4.400000e+00	4.399214e+00	4.399214e+00	
-89	4.450000e+00	4.450000e+00	4.449205e+00	4.449205e+00	
-90	4.500000e+00	4.500000e+00	4.499197e+00	4.499197e+00	
-91	4.550000e+00	4.550000e+00	4.549188e+00	4.549188e+00	
-92	4.600000e+00	4.600000e+00	4.599179e+00	4.599179e+00	
-93	4.650000e+00	4.650000e+00	4.649170e+00	4.649170e+00	
-94	4.700000e+00	4.700000e+00	4.699161e+00	4.699161e+00	
-95	4.750000e+00	4.750000e+00	4.749152e+00	4.749152e+00	
-96	4.800000e+00	4.800000e+00	4.799143e+00	4.799143e+00	
-97	4.850000e+00	4.850000e+00	4.849134e+00	4.849134e+00	
-98	4.900000e+00	4.900000e+00	4.899125e+00	4.899125e+00	
-99	4.950000e+00	4.950000e+00	4.949116e+00	4.949116e+00	
-100	5.000000e+00	5.000000e+00	4.999107e+00	4.999107e+00	
-101	5.050000e+00	5.050000e+00	5.049098e+00	5.049098e+00	
-102	5.100000e+00	5.100000e+00	5.099089e+00	5.099089e+00	
-103	5.150000e+00	5.150000e+00	5.149081e+00	5.149081e+00	
-104	5.200000e+00	5.200000e+00	5.199072e+00	5.199072e+00	
-105	5.250000e+00	5.250000e+00	5.249063e+00	5.249063e+00	
-106	5.300000e+00	5.300000e+00	5.299048e+00	5.299048e+00	
-107	5.350000e+00	5.350000e+00	5.348974e+00	5.348974e+00	
-108	5.400000e+00	5.400000e+00	5.398206e+00	5.398206e+00	
-109	5.450000e+00	5.450000e+00	5.441718e+00	5.441718e+00	
-110	5.500000e+00	5.500000e+00	5.469600e+00	5.469600e+00	
-111	5.550000e+00	5.550000e+00	5.485090e+00	5.485090e+00	
-112	5.600000e+00	5.600000e+00	5.494945e+00	5.494945e+00	
-
-Index   v-sweep         in              net-_r1-pad2_   out             
---------------------------------------------------------------------------------
-113	5.650000e+00	5.650000e+00	5.501799e+00	5.501799e+00	
-114	5.700000e+00	5.700000e+00	5.507084e+00	5.507084e+00	
-115	5.750000e+00	5.750000e+00	5.511352e+00	5.511352e+00	
-116	5.800000e+00	5.800000e+00	5.514919e+00	5.514919e+00	
-117	5.850000e+00	5.850000e+00	5.518205e+00	5.518205e+00	
-118	5.900000e+00	5.900000e+00	5.520794e+00	5.520794e+00	
-119	5.950000e+00	5.950000e+00	5.523141e+00	5.523141e+00	
-120	6.000000e+00	6.000000e+00	5.525248e+00	5.525248e+00	
-121	6.050000e+00	6.050000e+00	5.527164e+00	5.527164e+00	
-122	6.100000e+00	6.100000e+00	5.528919e+00	5.528919e+00	
-123	6.150000e+00	6.150000e+00	5.530538e+00	5.530538e+00	
-124	6.200000e+00	6.200000e+00	5.532039e+00	5.532039e+00	
-125	6.250000e+00	6.250000e+00	5.533439e+00	5.533439e+00	
-126	6.300000e+00	6.300000e+00	5.534750e+00	5.534750e+00	
-127	6.350000e+00	6.350000e+00	5.535982e+00	5.535982e+00	
-128	6.400000e+00	6.400000e+00	5.537145e+00	5.537145e+00	
-129	6.450000e+00	6.450000e+00	5.538245e+00	5.538245e+00	
-130	6.500000e+00	6.500000e+00	5.539289e+00	5.539289e+00	
-131	6.550000e+00	6.550000e+00	5.540283e+00	5.540283e+00	
-132	6.600000e+00	6.600000e+00	5.541231e+00	5.541231e+00	
-133	6.650000e+00	6.650000e+00	5.542136e+00	5.542136e+00	
-134	6.700000e+00	6.700000e+00	5.543003e+00	5.543003e+00	
-135	6.750000e+00	6.750000e+00	5.543835e+00	5.543835e+00	
-136	6.800000e+00	6.800000e+00	5.544634e+00	5.544634e+00	
-137	6.850000e+00	6.850000e+00	5.545402e+00	5.545402e+00	
-138	6.900000e+00	6.900000e+00	5.546143e+00	5.546143e+00	
-139	6.950000e+00	6.950000e+00	5.546858e+00	5.546858e+00	
-140	7.000000e+00	7.000000e+00	5.547548e+00	5.547548e+00	
-141	7.050000e+00	7.050000e+00	5.548216e+00	5.548216e+00	
-142	7.100000e+00	7.100000e+00	5.548863e+00	5.548863e+00	
-143	7.150000e+00	7.150000e+00	5.549489e+00	5.549489e+00	
-144	7.200000e+00	7.200000e+00	5.550097e+00	5.550097e+00	
-145	7.250000e+00	7.250000e+00	5.550687e+00	5.550687e+00	
-146	7.300000e+00	7.300000e+00	5.551260e+00	5.551260e+00	
-147	7.350000e+00	7.350000e+00	5.551817e+00	5.551817e+00	
-148	7.400000e+00	7.400000e+00	5.552360e+00	5.552360e+00	
-149	7.450000e+00	7.450000e+00	5.552888e+00	5.552888e+00	
-150	7.500000e+00	7.500000e+00	5.553403e+00	5.553403e+00	
-151	7.550000e+00	7.550000e+00	5.553905e+00	5.553905e+00	
-152	7.600000e+00	7.600000e+00	5.554395e+00	5.554395e+00	
-153	7.650000e+00	7.650000e+00	5.554874e+00	5.554874e+00	
-154	7.700000e+00	7.700000e+00	5.555341e+00	5.555341e+00	
-155	7.750000e+00	7.750000e+00	5.555798e+00	5.555798e+00	
-156	7.800000e+00	7.800000e+00	5.556244e+00	5.556244e+00	
-157	7.850000e+00	7.850000e+00	5.556681e+00	5.556681e+00	
-158	7.900000e+00	7.900000e+00	5.557109e+00	5.557109e+00	
-159	7.950000e+00	7.950000e+00	5.557528e+00	5.557528e+00	
-160	8.000000e+00	8.000000e+00	5.557938e+00	5.557938e+00	
-
-  * /home/fossee/esim-workspace/zener_characteristic/zener_characteristic.cir
-  DC transfer characteristic  Wed Mar 11 16:54:16  2020
---------------------------------------------------------------------------------
-Index   v-sweep         
---------------------------------------------------------------------------------
-0	0.000000e+00	
-1	5.000000e-02	
-2	1.000000e-01	
-3	1.500000e-01	
-4	2.000000e-01	
-5	2.500000e-01	
-6	3.000000e-01	
-7	3.500000e-01	
-8	4.000000e-01	
-9	4.500000e-01	
-10	5.000000e-01	
-11	5.500000e-01	
-12	6.000000e-01	
-13	6.500000e-01	
-14	7.000000e-01	
-15	7.500000e-01	
-16	8.000000e-01	
-17	8.500000e-01	
-18	9.000000e-01	
-19	9.500000e-01	
-20	1.000000e+00	
-21	1.050000e+00	
-22	1.100000e+00	
-23	1.150000e+00	
-24	1.200000e+00	
-25	1.250000e+00	
-26	1.300000e+00	
-27	1.350000e+00	
-28	1.400000e+00	
-29	1.450000e+00	
-30	1.500000e+00	
-31	1.550000e+00	
-32	1.600000e+00	
-33	1.650000e+00	
-34	1.700000e+00	
-35	1.750000e+00	
-36	1.800000e+00	
-37	1.850000e+00	
-38	1.900000e+00	
-39	1.950000e+00	
-40	2.000000e+00	
-41	2.050000e+00	
-42	2.100000e+00	
-43	2.150000e+00	
-44	2.200000e+00	
-45	2.250000e+00	
-46	2.300000e+00	
-47	2.350000e+00	
-48	2.400000e+00	
-49	2.450000e+00	
-50	2.500000e+00	
-51	2.550000e+00	
-52	2.600000e+00	
-53	2.650000e+00	
-54	2.700000e+00	
-
-Index   v-sweep         
---------------------------------------------------------------------------------
-55	2.750000e+00	
-56	2.800000e+00	
-57	2.850000e+00	
-58	2.900000e+00	
-59	2.950000e+00	
-60	3.000000e+00	
-61	3.050000e+00	
-62	3.100000e+00	
-63	3.150000e+00	
-64	3.200000e+00	
-65	3.250000e+00	
-66	3.300000e+00	
-67	3.350000e+00	
-68	3.400000e+00	
-69	3.450000e+00	
-70	3.500000e+00	
-71	3.550000e+00	
-72	3.600000e+00	
-73	3.650000e+00	
-74	3.700000e+00	
-75	3.750000e+00	
-76	3.800000e+00	
-77	3.850000e+00	
-78	3.900000e+00	
-79	3.950000e+00	
-80	4.000000e+00	
-81	4.050000e+00	
-82	4.100000e+00	
-83	4.150000e+00	
-84	4.200000e+00	
-85	4.250000e+00	
-86	4.300000e+00	
-87	4.350000e+00	
-88	4.400000e+00	
-89	4.450000e+00	
-90	4.500000e+00	
-91	4.550000e+00	
-92	4.600000e+00	
-93	4.650000e+00	
-94	4.700000e+00	
-95	4.750000e+00	
-96	4.800000e+00	
-97	4.850000e+00	
-98	4.900000e+00	
-99	4.950000e+00	
-100	5.000000e+00	
-101	5.050000e+00	
-102	5.100000e+00	
-103	5.150000e+00	
-104	5.200000e+00	
-105	5.250000e+00	
-106	5.300000e+00	
-107	5.350000e+00	
-108	5.400000e+00	
-109	5.450000e+00	
-110	5.500000e+00	
-111	5.550000e+00	
-112	5.600000e+00	
-
-Index   v-sweep         
---------------------------------------------------------------------------------
-113	5.650000e+00	
-114	5.700000e+00	
-115	5.750000e+00	
-116	5.800000e+00	
-117	5.850000e+00	
-118	5.900000e+00	
-119	5.950000e+00	
-120	6.000000e+00	
-121	6.050000e+00	
-122	6.100000e+00	
-123	6.150000e+00	
-124	6.200000e+00	
-125	6.250000e+00	
-126	6.300000e+00	
-127	6.350000e+00	
-128	6.400000e+00	
-129	6.450000e+00	
-130	6.500000e+00	
-131	6.550000e+00	
-132	6.600000e+00	
-133	6.650000e+00	
-134	6.700000e+00	
-135	6.750000e+00	
-136	6.800000e+00	
-137	6.850000e+00	
-138	6.900000e+00	
-139	6.950000e+00	
-140	7.000000e+00	
-141	7.050000e+00	
-142	7.100000e+00	
-143	7.150000e+00	
-144	7.200000e+00	
-145	7.250000e+00	
-146	7.300000e+00	
-147	7.350000e+00	
-148	7.400000e+00	
-149	7.450000e+00	
-150	7.500000e+00	
-151	7.550000e+00	
-152	7.600000e+00	
-153	7.650000e+00	
-154	7.700000e+00	
-155	7.750000e+00	
-156	7.800000e+00	
-157	7.850000e+00	
-158	7.900000e+00	
-159	7.950000e+00	
-160	8.000000e+00	
diff --git a/library/SubcircuitLibrary/2bitmul/2bitmul.pro b/library/SubcircuitLibrary/2bitmul/2bitmul.pro
index eafbfb80..07f0a660 100644
--- a/library/SubcircuitLibrary/2bitmul/2bitmul.pro
+++ b/library/SubcircuitLibrary/2bitmul/2bitmul.pro
@@ -52,10 +52,10 @@ LibName18=opto
 LibName19=atmel
 LibName20=contrib
 LibName21=power
-LibName22=device
+LibName22=eSim_Subckt
 LibName23=transistors
 LibName24=conn
-LibName25=linear
+LibName25=eSim_Plot
 LibName26=regul
 LibName27=74xx
 LibName28=cmos4000
@@ -69,6 +69,4 @@ LibName35=eSim_Sources
 LibName36=eSim_Subckt
 LibName37=eSim_User
 LibName38=eSim_Plot
-LibName39=eSim_PSpice
-LibName40=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
 
diff --git a/library/SubcircuitLibrary/3_and/3_and.pro b/library/SubcircuitLibrary/3_and/3_and.pro
index 76df4655..00597a5a 100644
--- a/library/SubcircuitLibrary/3_and/3_and.pro
+++ b/library/SubcircuitLibrary/3_and/3_and.pro
@@ -38,7 +38,6 @@ LibName4=eSim_Hybrid
 LibName5=eSim_Miscellaneous
 LibName6=eSim_Plot
 LibName7=eSim_Power
-LibName8=eSim_PSpice
+LibName8=eSim_User
 LibName9=eSim_Sources
 LibName10=eSim_Subckt
-LibName11=eSim_User
diff --git a/library/SubcircuitLibrary/4002/4002.pro b/library/SubcircuitLibrary/4002/4002.pro
index 225ef82a..96586117 100644
--- a/library/SubcircuitLibrary/4002/4002.pro
+++ b/library/SubcircuitLibrary/4002/4002.pro
@@ -31,14 +31,15 @@ NetIExt=net
 version=1
 LibDir=../../../kicadSchematicLibrary
 [eeschema/libraries]
-LibName1=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Analog
-LibName2=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Devices
-LibName3=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Digital
-LibName4=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Hybrid
-LibName5=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Miscellaneous
-LibName6=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Plot
-LibName7=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Power
-LibName8=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Sources
-LibName9=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Subckt
-LibName10=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_User
-LibName11=power
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Plot
+LibName7=eSim_Power
+LibName8=eSim_PSpice
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
+LibName12=power
diff --git a/library/SubcircuitLibrary/4017/4017.pro b/library/SubcircuitLibrary/4017/4017.pro
index 8cdecd6c..122143dd 100644
--- a/library/SubcircuitLibrary/4017/4017.pro
+++ b/library/SubcircuitLibrary/4017/4017.pro
@@ -52,10 +52,10 @@ LibName18=opto
 LibName19=atmel
 LibName20=contrib
 LibName21=power
-LibName22=device
+LibName22=eSim_Plot
 LibName23=transistors
 LibName24=conn
-LibName25=linear
+LibName25=eSim_User
 LibName26=regul
 LibName27=74xx
 LibName28=cmos4000
@@ -67,6 +67,4 @@ LibName33=eSim_Miscellaneous
 LibName34=eSim_Power
 LibName35=eSim_Sources
 LibName36=eSim_Subckt
-LibName37=eSim_User
-LibName38=eSim_Plot
 
diff --git a/library/SubcircuitLibrary/4_OR/4_OR.pro b/library/SubcircuitLibrary/4_OR/4_OR.pro
index 9daf26bc..881563eb 100644
--- a/library/SubcircuitLibrary/4_OR/4_OR.pro
+++ b/library/SubcircuitLibrary/4_OR/4_OR.pro
@@ -39,7 +39,6 @@ LibName5=eSim_Hybrid
 LibName6=eSim_Miscellaneous
 LibName7=eSim_Plot
 LibName8=eSim_Power
-LibName9=eSim_PSpice
+LibName9=eSim_User
 LibName10=eSim_Sources
 LibName11=eSim_Subckt
-LibName12=eSim_User
diff --git a/library/SubcircuitLibrary/556/556.pro b/library/SubcircuitLibrary/556/556.pro
index a165313d..5a379015 100644
--- a/library/SubcircuitLibrary/556/556.pro
+++ b/library/SubcircuitLibrary/556/556.pro
@@ -32,7 +32,7 @@ version=1
 LibDir=
 [eeschema/libraries]
 LibName1=power
-LibName2=device
+LibName2=eSim_Analog
 LibName3=transistors
 LibName4=conn
 LibName5=regul
@@ -69,4 +69,3 @@ LibName35=eSim_Miscellaneous
 LibName36=eSim_Hybrid
 LibName37=eSim_Digital
 LibName38=eSim_Devices
-LibName39=eSim_Analog
diff --git a/library/SubcircuitLibrary/5_and/5_and.pro b/library/SubcircuitLibrary/5_and/5_and.pro
index 7a2f090e..b09b3dde 100644
--- a/library/SubcircuitLibrary/5_and/5_and.pro
+++ b/library/SubcircuitLibrary/5_and/5_and.pro
@@ -44,7 +44,6 @@ LibName10=eSim_Hybrid
 LibName11=eSim_Miscellaneous
 LibName12=eSim_Plot
 LibName13=eSim_Power
-LibName14=eSim_PSpice
+LibName14=eSim_User
 LibName15=eSim_Sources
 LibName16=eSim_Subckt
-LibName17=eSim_User
diff --git a/library/SubcircuitLibrary/74153/74153.pro b/library/SubcircuitLibrary/74153/74153.pro
index ed8b8bf2..a4d6d3bb 100644
--- a/library/SubcircuitLibrary/74153/74153.pro
+++ b/library/SubcircuitLibrary/74153/74153.pro
@@ -32,7 +32,7 @@ version=1
 LibDir=
 [eeschema/libraries]
 LibName1=power
-LibName2=device
+LibName2=eSim_User
 LibName3=texas
 LibName4=intel
 LibName5=audio
@@ -53,7 +53,5 @@ LibName19=eSim_Hybrid
 LibName20=eSim_Miscellaneous
 LibName21=eSim_Plot
 LibName22=eSim_Power
-LibName23=eSim_PSpice
+LibName23=eSim_Subckt
 LibName24=eSim_Sources
-LibName25=eSim_User
-LibName26=eSim_Subckt
diff --git a/library/SubcircuitLibrary/74157/74157.pro b/library/SubcircuitLibrary/74157/74157.pro
index fcbb1fc8..c18140ca 100644
--- a/library/SubcircuitLibrary/74157/74157.pro
+++ b/library/SubcircuitLibrary/74157/74157.pro
@@ -51,7 +51,6 @@ LibName17=eSim_Hybrid
 LibName18=eSim_Miscellaneous
 LibName19=eSim_Plot
 LibName20=eSim_Power
-LibName21=eSim_PSpice
+LibName21=eSim_Subckt
 LibName22=eSim_Sources
 LibName23=eSim_User
-LibName24=eSim_Subckt
diff --git a/library/SubcircuitLibrary/7485/7485.pro b/library/SubcircuitLibrary/7485/7485.pro
index 8fb4abb4..1f89e4a2 100644
--- a/library/SubcircuitLibrary/7485/7485.pro
+++ b/library/SubcircuitLibrary/7485/7485.pro
@@ -52,7 +52,6 @@ LibName18=eSim_Hybrid
 LibName19=eSim_Miscellaneous
 LibName20=eSim_Plot
 LibName21=eSim_Power
-LibName22=eSim_PSpice
+LibName22=eSim_Subckt
 LibName23=eSim_Sources
 LibName24=eSim_User
-LibName25=eSim_Subckt
diff --git a/library/SubcircuitLibrary/INVCMOS/INVCMOS.pro b/library/SubcircuitLibrary/INVCMOS/INVCMOS.pro
index b3f410b6..81bd9ad4 100644
--- a/library/SubcircuitLibrary/INVCMOS/INVCMOS.pro
+++ b/library/SubcircuitLibrary/INVCMOS/INVCMOS.pro
@@ -52,10 +52,10 @@ LibName18=opto
 LibName19=atmel
 LibName20=contrib
 LibName21=power
-LibName22=device
+LibName22=eSim_Subckt
 LibName23=transistors
 LibName24=conn
-LibName25=linear
+LibName25=eSim_Plot
 LibName26=regul
 LibName27=74xx
 LibName28=cmos4000
@@ -67,7 +67,4 @@ LibName33=eSim_Miscellaneous
 LibName34=eSim_Power
 LibName35=eSim_Sources
 LibName36=eSim_User
-LibName37=eSim_Plot
-LibName38=eSim_PSpice
-LibName39=/home/saurabh/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
 
diff --git a/library/SubcircuitLibrary/LM7812/LM7812.pro b/library/SubcircuitLibrary/LM7812/LM7812.pro
index 12d08139..05bf56eb 100644
--- a/library/SubcircuitLibrary/LM7812/LM7812.pro
+++ b/library/SubcircuitLibrary/LM7812/LM7812.pro
@@ -39,8 +39,7 @@ LibName5=eSim_Hybrid
 LibName6=eSim_Miscellaneous
 LibName7=eSim_Plot
 LibName8=eSim_Power
-LibName9=eSim_PSpice
+LibName9=eSim_User
 LibName10=eSim_Sources
 LibName11=eSim_Subckt
-LibName12=eSim_User
 
diff --git a/library/SubcircuitLibrary/full_adder/full_adder.pro b/library/SubcircuitLibrary/full_adder/full_adder.pro
index c0db0775..ad45a0b3 100644
--- a/library/SubcircuitLibrary/full_adder/full_adder.pro
+++ b/library/SubcircuitLibrary/full_adder/full_adder.pro
@@ -31,39 +31,14 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog
-LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices
-LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital
-LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid
-LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources
-LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Plot
+LibName7=eSim_Power
+LibName8=power
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
diff --git a/library/SubcircuitLibrary/full_sub/full_sub.pro b/library/SubcircuitLibrary/full_sub/full_sub.pro
index 1a0c3543..0bd5378a 100644
--- a/library/SubcircuitLibrary/full_sub/full_sub.pro
+++ b/library/SubcircuitLibrary/full_sub/full_sub.pro
@@ -53,10 +53,10 @@ LibName19=opto
 LibName20=atmel
 LibName21=contrib
 LibName22=power
-LibName23=device
+LibName23=eSim_Plot
 LibName24=transistors
 LibName25=conn
-LibName26=linear
+LibName26=eSim_User
 LibName27=regul
 LibName28=74xx
 LibName29=cmos4000
@@ -68,7 +68,4 @@ LibName34=eSim_Miscellaneous
 LibName35=eSim_Power
 LibName36=eSim_Sources
 LibName37=eSim_Subckt
-LibName38=eSim_User
-LibName39=eSim_Plot
-LibName40=eSim_PSpice
 
diff --git a/library/SubcircuitLibrary/half_adder/half_adder.pro b/library/SubcircuitLibrary/half_adder/half_adder.pro
index 695ae0f6..9b836d16 100644
--- a/library/SubcircuitLibrary/half_adder/half_adder.pro
+++ b/library/SubcircuitLibrary/half_adder/half_adder.pro
@@ -31,39 +31,13 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=/home/gaurav/Desktop/eSim Library/eSim_Analog
-LibName32=/home/gaurav/Desktop/eSim Library/eSim_Devices
-LibName33=/home/gaurav/Desktop/eSim Library/eSim_Digital
-LibName34=/home/gaurav/Desktop/eSim Library/eSim_Hybrid
-LibName35=/home/gaurav/Desktop/eSim Library/eSim_Sources
-LibName36=/home/gaurav/Desktop/eSim Library/eSim_Subckt
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Plot
+LibName7=eSim_Power
+LibName8=eSim_User
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
diff --git a/library/SubcircuitLibrary/half_sub/half_sub.pro b/library/SubcircuitLibrary/half_sub/half_sub.pro
index 90e3ded9..a923995f 100644
--- a/library/SubcircuitLibrary/half_sub/half_sub.pro
+++ b/library/SubcircuitLibrary/half_sub/half_sub.pro
@@ -52,10 +52,10 @@ LibName18=opto
 LibName19=atmel
 LibName20=contrib
 LibName21=power
-LibName22=device
+LibName22=eSim_Plot
 LibName23=transistors
 LibName24=conn
-LibName25=linear
+LibName25=eSim_Subckt
 LibName26=regul
 LibName27=74xx
 LibName28=cmos4000
@@ -69,6 +69,4 @@ LibName35=eSim_Sources
 LibName36=eSim_Subckt
 LibName37=eSim_User
 LibName38=eSim_Plot
-LibName39=eSim_PSpice
-LibName40=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
 
diff --git a/library/SubcircuitLibrary/lm555n/lm555n.pro b/library/SubcircuitLibrary/lm555n/lm555n.pro
index 0a5408b6..662ea66d 100644
--- a/library/SubcircuitLibrary/lm555n/lm555n.pro
+++ b/library/SubcircuitLibrary/lm555n/lm555n.pro
@@ -1,4 +1,4 @@
-update=Tue Apr  2 17:35:59 2019
+update=Wed Mar 18 14:16:41 2020
 last_client=eeschema
 [eeschema]
 version=1
@@ -6,52 +6,39 @@ LibDir=/home/yogesh/FreeEDA/library
 [eeschema/libraries]
 LibName1=lm555n-rescue
 LibName2=power
-LibName3=device
-LibName4=transistors
-LibName5=conn
-LibName6=linear
-LibName7=regul
-LibName8=74xx
-LibName9=cmos4000
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=special
-LibName14=microcontrollers
-LibName15=dsp
-LibName16=microchip
-LibName17=analog_switches
-LibName18=motorola
-LibName19=texas
-LibName20=intel
-LibName21=audio
-LibName22=interface
-LibName23=digital-audio
-LibName24=philips
-LibName25=display
-LibName26=cypress
-LibName27=siliconi
-LibName28=opto
-LibName29=atmel
-LibName30=contrib
-LibName31=valves
-LibName32=analogSpice
-LibName33=analogXSpice
-LibName34=converterSpice
-LibName35=digitalSpice
-LibName36=linearSpice
-LibName37=measurementSpice
-LibName38=portSpice
-LibName39=sourcesSpice
-LibName40=digitalXSpice
-LibName41=eSim_User
-LibName42=eSim_Subckt
-LibName43=eSim_Sources
-LibName44=eSim_PSpice
-LibName45=eSim_Power
-LibName46=eSim_Plot
-LibName47=eSim_Miscellaneous
-LibName48=eSim_Hybrid
-LibName49=eSim_Digital
-LibName50=eSim_Devices
-LibName51=eSim_Analog
+LibName3=transistors
+LibName4=conn
+LibName5=regul
+LibName6=74xx
+LibName7=cmos4000
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=microcontrollers
+LibName12=dsp
+LibName13=microchip
+LibName14=analog_switches
+LibName15=motorola
+LibName16=texas
+LibName17=intel
+LibName18=audio
+LibName19=interface
+LibName20=digital-audio
+LibName21=philips
+LibName22=display
+LibName23=cypress
+LibName24=siliconi
+LibName25=opto
+LibName26=atmel
+LibName27=contrib
+LibName28=valves
+LibName29=eSim_User
+LibName30=eSim_Subckt
+LibName31=eSim_Sources
+LibName32=eSim_Power
+LibName33=eSim_Plot
+LibName34=eSim_Miscellaneous
+LibName35=eSim_Hybrid
+LibName36=eSim_Digital
+LibName37=eSim_Devices
+LibName38=eSim_Analog
diff --git a/library/SubcircuitLibrary/lm7805/lm7805.pro b/library/SubcircuitLibrary/lm7805/lm7805.pro
index d410e2fa..a34e9e90 100644
--- a/library/SubcircuitLibrary/lm7805/lm7805.pro
+++ b/library/SubcircuitLibrary/lm7805/lm7805.pro
@@ -38,8 +38,6 @@ LibName4=eSim_Hybrid
 LibName5=eSim_Miscellaneous
 LibName6=eSim_Plot
 LibName7=eSim_Power
-LibName8=eSim_PSpice
+LibName8=eSim_User
 LibName9=eSim_Sources
 LibName10=eSim_Subckt
-LibName11=eSim_User
-
diff --git a/library/SubcircuitLibrary/lm_741/lm_741.pro b/library/SubcircuitLibrary/lm_741/lm_741.pro
index cbe83f35..b56de1b0 100644
--- a/library/SubcircuitLibrary/lm_741/lm_741.pro
+++ b/library/SubcircuitLibrary/lm_741/lm_741.pro
@@ -39,7 +39,6 @@ LibName5=eSim_Hybrid
 LibName6=eSim_Miscellaneous
 LibName7=eSim_Plot
 LibName8=eSim_Power
-LibName9=eSim_PSpice
+LibName9=eSim_User
 LibName10=eSim_Sources
 LibName11=eSim_Subckt
-LibName12=eSim_User
diff --git a/library/SubcircuitLibrary/scr/scr.pro b/library/SubcircuitLibrary/scr/scr.pro
index ca0df803..0f8620ee 100644
--- a/library/SubcircuitLibrary/scr/scr.pro
+++ b/library/SubcircuitLibrary/scr/scr.pro
@@ -14,32 +14,3 @@ LibName7=eSim_Sources
 LibName8=eSim_Subckt
 LibName9=eSim_User
 LibName10=power
-LibName11=device
-LibName12=transistors
-LibName13=conn
-LibName14=linear
-LibName15=regul
-LibName16=74xx
-LibName17=cmos4000
-LibName18=adc-dac
-LibName19=memory
-LibName20=xilinx
-LibName21=special
-LibName22=microcontrollers
-LibName23=dsp
-LibName24=microchip
-LibName25=analog_switches
-LibName26=motorola
-LibName27=texas
-LibName28=intel
-LibName29=audio
-LibName30=interface
-LibName31=digital-audio
-LibName32=philips
-LibName33=display
-LibName34=cypress
-LibName35=siliconi
-LibName36=opto
-LibName37=atmel
-LibName38=contrib
-LibName39=valves
diff --git a/library/SubcircuitLibrary/ua741/ua741-cache.lib b/library/SubcircuitLibrary/ua741/ua741-cache.lib
new file mode 100644
index 00000000..a330f429
--- /dev/null
+++ b/library/SubcircuitLibrary/ua741/ua741-cache.lib
@@ -0,0 +1,127 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 75 50 H I C CNN
+F1 "PWR_FLAG" 0 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+X pwr 1 0 0 0 U 50 50 0 0 w
+P 6 0 1 0 0 0 0 50 -40 75 0 100 40 75 0 50 N
+ENDDRAW
+ENDDEF
+#
+# VCVS
+#
+DEF VCVS E 0 40 Y Y 1 F N
+F0 "E" 0 150 50 H V C CNN
+F1 "VCVS" -200 -50 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+S -100 100 100 -100 0 1 0 N
+X + 1 -300 50 200 R 35 35 1 1 P
+X - 2 300 50 200 L 35 35 1 1 P
+X +c 3 -50 -200 100 U 35 35 1 1 P
+X -c 4 50 -200 100 U 35 35 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_C
+#
+DEF eSim_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "eSim_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS capacitor
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_R
+#
+DEF eSim_R R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "eSim_R" 50 -50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+ALIAS resistor
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/ua741/ua741.pro b/library/SubcircuitLibrary/ua741/ua741.pro
index 5dbb81a5..c7b1d67b 100644
--- a/library/SubcircuitLibrary/ua741/ua741.pro
+++ b/library/SubcircuitLibrary/ua741/ua741.pro
@@ -1,72 +1,17 @@
-update=Monday 17 December 2012 06:14:06 PM IST
+update=Wed Mar 18 14:21:29 2020
 last_client=eeschema
 [eeschema]
 version=1
 LibDir=/home/yogesh/FreeEDA/library
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
 [eeschema/libraries]
 LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=analogSpice
-LibName32=converterSpice
-LibName33=digitalSpice
-LibName34=linearSpice
-LibName35=measurementSpice
-LibName36=portSpice
-LibName37=sourcesSpice
-LibName38=analogXSpice
+LibName2=eSim_Devices
+LibName3=eSim_User
+LibName4=eSim_Subckt
+LibName5=eSim_Sources
+LibName6=eSim_Power
+LibName7=eSim_Plot
+LibName8=eSim_Miscellaneous
+LibName9=eSim_Hybrid
+LibName10=eSim_Digital
+LibName11=eSim_Analog
diff --git a/library/SubcircuitLibrary/ua741/ua741.sch b/library/SubcircuitLibrary/ua741/ua741.sch
index 7dfc5e1a..b06dcc17 100644
--- a/library/SubcircuitLibrary/ua741/ua741.sch
+++ b/library/SubcircuitLibrary/ua741/ua741.sch
@@ -1,46 +1,18 @@
-EESchema Schematic File Version 2  date Wednesday 19 December 2012 10:15:16 AM IST
+EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:analogSpice
-LIBS:converterSpice
-LIBS:digitalSpice
-LIBS:linearSpice
-LIBS:measurementSpice
-LIBS:portSpice
-LIBS:sourcesSpice
-LIBS:analogXSpice
-LIBS:ua741-cache
-EELAYER 25  0
+LIBS:eSim_Devices
+LIBS:eSim_User
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_Power
+LIBS:eSim_Plot
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Analog
+EELAYER 25 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title ""
@@ -68,6 +40,8 @@ U 6 1 5082C027
 P 6250 2500
 F 0 "U1" H 6250 2450 30  0000 C CNN
 F 1 "PORT" H 6250 2500 30  0000 C CNN
+F 2 "" H 6250 2500 60  0001 C CNN
+F 3 "" H 6250 2500 60  0001 C CNN
 	6    6250 2500
 	-1   0    0    1   
 $EndComp
@@ -77,6 +51,8 @@ U 2 1 5082C011
 P 2300 3100
 F 0 "U1" H 2300 3050 30  0000 C CNN
 F 1 "PORT" H 2300 3100 30  0000 C CNN
+F 2 "" H 2300 3100 60  0001 C CNN
+F 3 "" H 2300 3100 60  0001 C CNN
 	2    2300 3100
 	1    0    0    -1  
 $EndComp
@@ -86,9 +62,57 @@ U 3 1 5082C00B
 P 2250 2600
 F 0 "U1" H 2250 2550 30  0000 C CNN
 F 1 "PORT" H 2250 2600 30  0000 C CNN
+F 2 "" H 2250 2600 60  0001 C CNN
+F 3 "" H 2250 2600 60  0001 C CNN
 	3    2250 2600
 	1    0    0    -1  
 $EndComp
+$Comp
+L PWR_FLAG #FLG1
+U 1 1 508152A0
+P 3450 3200
+F 0 "#FLG1" H 3450 3470 30  0001 C CNN
+F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
+F 2 "" H 3450 3200 60  0001 C CNN
+F 3 "" H 3450 3200 60  0001 C CNN
+	1    3450 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Eout1
+U 1 1 50813F0F
+P 5200 2900
+F 0 "Eout1" H 5000 3000 50  0000 C CNN
+F 1 "1" H 5000 2850 50  0000 C CNN
+F 2 "" H 5200 2900 60  0001 C CNN
+F 3 "" H 5200 2900 60  0001 C CNN
+	1    5200 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 50813E0D
+P 3700 3400
+F 0 "#PWR1" H 3700 3400 30  0001 C CNN
+F 1 "GND" H 3700 3330 30  0001 C CNN
+F 2 "" H 3700 3400 60  0001 C CNN
+F 3 "" H 3700 3400 60  0001 C CNN
+	1    3700 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Ein1
+U 1 1 50813D7C
+P 3650 2850
+F 0 "Ein1" H 3450 2950 50  0000 C CNN
+F 1 "100e3" H 3450 2800 50  0000 C CNN
+F 2 "" H 3650 2850 60  0001 C CNN
+F 3 "" H 3650 2850 60  0001 C CNN
+	1    3650 2850
+	0    1    1    0   
+$EndComp
+Text Notes 2600 2900 0    60   ~ 0
+2e6\n
 Connection ~ 3700 3200
 Wire Wire Line
 	3450 3200 3700 3200
@@ -102,7 +126,7 @@ Wire Wire Line
 	5000 3300 5000 2950
 Connection ~ 3700 3300
 Wire Wire Line
-	4550 3300 4550 3100
+	4550 3000 4550 3300
 Wire Wire Line
 	3900 2500 3700 2500
 Wire Wire Line
@@ -141,79 +165,65 @@ Connection ~ 4550 2500
 Wire Wire Line
 	5250 2600 5250 2500
 Wire Wire Line
-	5250 2500 5350 2500
+	5250 2500 5400 2500
 Wire Wire Line
-	5850 2500 6000 2500
+	5700 2500 6000 2500
 $Comp
-L PWR_FLAG #FLG01
-U 1 1 508152A0
-P 3450 3200
-F 0 "#FLG01" H 3450 3470 30  0001 C CNN
-F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
-	1    3450 3200
-	1    0    0    -1  
-$EndComp
-$Comp
-L R Rout1
-U 1 1 50813F5B
-P 5600 2500
-F 0 "Rout1" V 5680 2500 50  0000 C CNN
-F 1 "75" V 5600 2500 50  0000 C CNN
-	1    5600 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L VCVS Eout1
-U 1 1 50813F0F
-P 5200 2900
-F 0 "Eout1" H 5000 3000 50  0000 C CNN
-F 1 "1" H 5000 2850 50  0000 C CNN
-	1    5200 2900
+L resistor Rin1
+U 1 1 5E71E232
+P 2950 2900
+F 0 "Rin1" H 3000 3030 50  0000 C CNN
+F 1 "2e6" H 3000 2850 50  0000 C CNN
+F 2 "" H 3000 2880 30  0000 C CNN
+F 3 "" V 3000 2950 30  0000 C CNN
+	1    2950 2900
 	0    1    1    0   
 $EndComp
+Wire Wire Line
+	3000 2600 3000 2800
 $Comp
-L C Cbw1
-U 1 1 50813EE0
-P 4550 2900
-F 0 "Cbw1" H 4600 3000 50  0000 L CNN
-F 1 "31.85e-9" H 4600 2800 50  0000 L CNN
-	1    4550 2900
+L resistor Rbw1
+U 1 1 5E71E326
+P 4050 2100
+F 0 "Rbw1" H 4100 2230 50  0000 C CNN
+F 1 "0.5e6" H 4100 2050 50  0000 C CNN
+F 2 "" H 4100 2080 30  0000 C CNN
+F 3 "" V 4100 2150 30  0000 C CNN
+	1    4050 2100
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	3900 2500 3900 2050
+Wire Wire Line
+	3900 2050 3950 2050
+Wire Wire Line
+	4250 2050 4400 2050
+Wire Wire Line
+	4400 2050 4400 2500
 $Comp
-L R Rbw1
-U 1 1 50813EAB
-P 4150 2500
-F 0 "Rbw1" V 4230 2500 50  0000 C CNN
-F 1 "0.5e6" V 4150 2500 50  0000 C CNN
-	1    4150 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR02
-U 1 1 50813E0D
-P 3700 3400
-F 0 "#PWR02" H 3700 3400 30  0001 C CNN
-F 1 "GND" H 3700 3330 30  0001 C CNN
-	1    3700 3400
+L capacitor Cbw1
+U 1 1 5E71E45C
+P 4550 2850
+F 0 "Cbw1" H 4575 2950 50  0000 L CNN
+F 1 "31.85e-9" H 4575 2750 50  0000 L CNN
+F 2 "" H 4588 2700 30  0000 C CNN
+F 3 "" H 4550 2850 60  0000 C CNN
+	1    4550 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCVS Ein1
-U 1 1 50813D7C
-P 3650 2850
-F 0 "Ein1" H 3450 2950 50  0000 C CNN
-F 1 "100e3" H 3450 2800 50  0000 C CNN
-	1    3650 2850
-	0    1    1    0   
-$EndComp
-$Comp
-L R Rin1
-U 1 1 50813C57
-P 3000 2850
-F 0 "Rin1" V 3080 2850 50  0000 C CNN
-F 1 "2e6" V 3000 2850 50  0000 C CNN
-	1    3000 2850
+L resistor Rout1
+U 1 1 5E71E59C
+P 5500 2250
+F 0 "Rout1" H 5550 2380 50  0000 C CNN
+F 1 "75" H 5550 2200 50  0000 C CNN
+F 2 "" H 5550 2230 30  0000 C CNN
+F 3 "" V 5550 2300 30  0000 C CNN
+	1    5500 2250
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5400 2500 5400 2200
+Wire Wire Line
+	5700 2200 5700 2500
 $EndSCHEMATC