restructured eSim libraries

12 files changed, 0 insertions, 744 deletions

diff --git a/src/SubcircuitLibrary/CA3096/CA3096-cache.lib b/src/SubcircuitLibrary/CA3096/CA3096-cache.lib
deleted file mode 100644
index 16f09ee3..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096-cache.lib
+++ /dev/null
@@ -1,83 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# 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
-#
-# eSim_NPN
-#
-DEF eSim_NPN Q 0 0 Y N 1 F N
-F0 "Q" -100 50 50 H V R CNN
-F1 "eSim_NPN" -50 150 50 H V R CNN
-F2 "" 200 100 29 H V C CNN
-F3 "" 0 0 60 H V C CNN
-ALIAS BC547 Q2N2222
-DRAW
-C 50 0 111 0 1 10 N
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-X C 1 100 200 100 D 50 50 1 1 C
-X B 2 -200 0 225 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 E
-ENDDRAW
-ENDDEF
-#
-# eSim_PNP
-#
-DEF eSim_PNP Q 0 0 Y N 1 F N
-F0 "Q" -100 50 50 H V R CNN
-F1 "eSim_PNP" -50 150 50 H V R CNN
-F2 "" 200 100 29 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-C 50 0 111 0 1 10 N
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-X C 1 100 200 100 D 50 50 1 1 C
-X B 2 -200 0 225 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 E
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.cir b/src/SubcircuitLibrary/CA3096/CA3096.cir
deleted file mode 100644
index 5a3af0fb..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.cir
+++ /dev/null
@@ -1,16 +0,0 @@
-* /home/bhargav/Downloads/eSim-1.1.2/src/SubcircuitLibrary/CA3096/CA3096.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: Sat Jun 22 12:00:17 2019
-
-* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
-* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
-
-* Sheet Name: /
-Q1  Net-_Q1-Pad1_ Net-_Q1-Pad2_ Net-_Q1-Pad3_ eSim_NPN		
-Q2  Net-_Q2-Pad1_ Net-_Q2-Pad2_ Net-_Q2-Pad3_ eSim_NPN		
-Q5  Net-_Q5-Pad1_ Net-_Q5-Pad2_ Net-_Q5-Pad3_ eSim_PNP		
-Q4  Net-_Q4-Pad1_ Net-_Q4-Pad2_ Net-_Q4-Pad3_ eSim_PNP		
-U1  Net-_Q1-Pad2_ Net-_Q1-Pad3_ Net-_Q1-Pad1_ Net-_Q2-Pad3_ Net-_Q2-Pad2_ Net-_Q2-Pad1_ Net-_Q3-Pad3_ Net-_Q3-Pad2_ Net-_Q3-Pad1_ Net-_Q4-Pad3_ Net-_Q5-Pad2_ Net-_Q5-Pad1_ Net-_Q5-Pad3_ Net-_Q4-Pad2_ Net-_Q4-Pad1_ ? PORT		
-Q3  Net-_Q3-Pad1_ Net-_Q3-Pad2_ Net-_Q3-Pad3_ eSim_NPN		
-
-.end
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.cir.out b/src/SubcircuitLibrary/CA3096/CA3096.cir.out
deleted file mode 100644
index 89c57845..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.cir.out
+++ /dev/null
@@ -1,19 +0,0 @@
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ca3096/ca3096.cir
-
-.include PNP.lib
-.include NPN.lib
-q1 net-_q1-pad1_ net-_q1-pad2_ net-_q1-pad3_ Q2N2222
-q2 net-_q2-pad1_ net-_q2-pad2_ net-_q2-pad3_ Q2N2222
-q5 net-_q5-pad1_ net-_q5-pad2_ net-_q5-pad3_ Q2N2907A
-q4 net-_q4-pad1_ net-_q4-pad2_ net-_q4-pad3_ Q2N2907A
-* u1  net-_q1-pad2_ net-_q1-pad3_ net-_q1-pad1_ net-_q2-pad3_ net-_q2-pad2_ net-_q2-pad1_ net-_q3-pad3_ net-_q3-pad2_ net-_q3-pad1_ net-_q4-pad3_ net-_q5-pad2_ net-_q5-pad1_ net-_q5-pad3_ net-_q4-pad2_ net-_q4-pad1_ ? port
-q3 net-_q3-pad1_ net-_q3-pad2_ net-_q3-pad3_ Q2N2222
-.tran 10e-03 100e-03 0e-00
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.pro b/src/SubcircuitLibrary/CA3096/CA3096.pro
deleted file mode 100644
index d91a953f..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.pro
+++ /dev/null
@@ -1,82 +0,0 @@
-update=Sat Jun 22 11:58:40 2019
-version=1
-last_client=eeschema
-[general]
-version=1
-RootSch=
-BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=../../../kicadSchematicLibrary
-[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=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=eSim_Analog
-LibName31=eSim_Devices
-LibName32=eSim_Digital
-LibName33=eSim_Hybrid
-LibName34=eSim_Miscellaneous
-LibName35=eSim_Plot
-LibName36=eSim_Power
-LibName37=eSim_Sources
-LibName38=eSim_Subckt
-LibName39=eSim_User
-LibName40=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
-LibName41=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
-LibName42=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
-LibName43=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
-LibName44=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
-LibName45=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
-LibName46=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
-LibName47=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
-LibName48=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-LibName49=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.sch b/src/SubcircuitLibrary/CA3096/CA3096.sch
deleted file mode 100644
index 3c08258c..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.sch
+++ /dev/null
@@ -1,328 +0,0 @@
-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: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:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-LIBS:eSim_Hybrid
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Plot
-LIBS:eSim_Power
-LIBS:eSim_Sources
-LIBS:eSim_Subckt
-LIBS:eSim_User
-LIBS:CA3096-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L eSim_NPN Q1
-U 1 1 5C98EEF5
-P 4150 4250
-F 0 "Q1" H 4050 4300 50  0000 R CNN
-F 1 "eSim_NPN" H 4100 4400 50  0000 R CNN
-F 2 "" H 4350 4350 29  0000 C CNN
-F 3 "" H 4150 4250 60  0000 C CNN
-	1    4150 4250
-	-1   0    0    1   
-$EndComp
-$Comp
-L eSim_NPN Q2
-U 1 1 5C98EFC9
-P 4250 4950
-F 0 "Q2" H 4150 5000 50  0000 R CNN
-F 1 "eSim_NPN" H 4200 5100 50  0000 R CNN
-F 2 "" H 4450 5050 29  0000 C CNN
-F 3 "" H 4250 4950 60  0000 C CNN
-	1    4250 4950
-	1    0    0    1   
-$EndComp
-$Comp
-L eSim_PNP Q5
-U 1 1 5C98F076
-P 5300 5400
-F 0 "Q5" H 5200 5450 50  0000 R CNN
-F 1 "eSim_PNP" H 5250 5550 50  0000 R CNN
-F 2 "" H 5500 5500 29  0000 C CNN
-F 3 "" H 5300 5400 60  0000 C CNN
-	1    5300 5400
-	-1   0    0    -1  
-$EndComp
-$Comp
-L eSim_PNP Q4
-U 1 1 5C98F0A7
-P 5300 4650
-F 0 "Q4" H 5200 4700 50  0000 R CNN
-F 1 "eSim_PNP" H 5250 4800 50  0000 R CNN
-F 2 "" H 5500 4750 29  0000 C CNN
-F 3 "" H 5300 4650 60  0000 C CNN
-	1    5300 4650
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	4350 3800 4350 4250
-Wire Wire Line
-	4350 5450 4350 5150
-Wire Wire Line
-	5200 5600 5200 5700
-Wire Wire Line
-	5200 4850 5200 4950
-Wire Wire Line
-	5200 4200 5200 4450
-$Comp
-L PORT U1
-U 1 1 5C98F1D4
-P 2950 3800
-F 0 "U1" H 3000 3900 30  0000 C CNN
-F 1 "PORT" H 2950 3800 30  0000 C CNN
-F 2 "" H 2950 3800 60  0000 C CNN
-F 3 "" H 2950 3800 60  0000 C CNN
-	1    2950 3800
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C98F222
-P 2950 4450
-F 0 "U1" H 3000 4550 30  0000 C CNN
-F 1 "PORT" H 2950 4450 30  0000 C CNN
-F 2 "" H 2950 4450 60  0000 C CNN
-F 3 "" H 2950 4450 60  0000 C CNN
-	3    2950 4450
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 5 1 5C98F272
-P 2950 4950
-F 0 "U1" H 3000 5050 30  0000 C CNN
-F 1 "PORT" H 2950 4950 30  0000 C CNN
-F 2 "" H 2950 4950 60  0000 C CNN
-F 3 "" H 2950 4950 60  0000 C CNN
-	5    2950 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 6 1 5C98F29F
-P 2950 5450
-F 0 "U1" H 3000 5550 30  0000 C CNN
-F 1 "PORT" H 2950 5450 30  0000 C CNN
-F 2 "" H 2950 5450 60  0000 C CNN
-F 3 "" H 2950 5450 60  0000 C CNN
-	6    2950 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 9 1 5C98F38F
-P 6150 6050
-F 0 "U1" H 6200 6150 30  0000 C CNN
-F 1 "PORT" H 6150 6050 30  0000 C CNN
-F 2 "" H 6150 6050 60  0000 C CNN
-F 3 "" H 6150 6050 60  0000 C CNN
-	9    6150 6050
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 11 1 5C98F4ED
-P 6150 5400
-F 0 "U1" H 6200 5500 30  0000 C CNN
-F 1 "PORT" H 6150 5400 30  0000 C CNN
-F 2 "" H 6150 5400 60  0000 C CNN
-F 3 "" H 6150 5400 60  0000 C CNN
-	11   6150 5400
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 12 1 5C98F52C
-P 6150 5200
-F 0 "U1" H 6200 5300 30  0000 C CNN
-F 1 "PORT" H 6150 5200 30  0000 C CNN
-F 2 "" H 6150 5200 60  0000 C CNN
-F 3 "" H 6150 5200 60  0000 C CNN
-	12   6150 5200
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 14 1 5C98F5BA
-P 6150 4650
-F 0 "U1" H 6200 4750 30  0000 C CNN
-F 1 "PORT" H 6150 4650 30  0000 C CNN
-F 2 "" H 6150 4650 60  0000 C CNN
-F 3 "" H 6150 4650 60  0000 C CNN
-	14   6150 4650
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 15 1 5C98F5FF
-P 6150 4200
-F 0 "U1" H 6200 4300 30  0000 C CNN
-F 1 "PORT" H 6150 4200 30  0000 C CNN
-F 2 "" H 6150 4200 60  0000 C CNN
-F 3 "" H 6150 4200 60  0000 C CNN
-	15   6150 4200
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 10 1 5C9C8B88
-P 6150 4950
-F 0 "U1" H 6200 5050 30  0000 C CNN
-F 1 "PORT" H 6150 4950 30  0000 C CNN
-F 2 "" H 6150 4950 60  0000 C CNN
-F 3 "" H 6150 4950 60  0000 C CNN
-	10   6150 4950
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 13 1 5C9C9E21
-P 6150 5700
-F 0 "U1" H 6200 5800 30  0000 C CNN
-F 1 "PORT" H 6150 5700 30  0000 C CNN
-F 2 "" H 6150 5700 60  0000 C CNN
-F 3 "" H 6150 5700 60  0000 C CNN
-	13   6150 5700
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	3200 3800 4350 3800
-Wire Wire Line
-	3200 4450 4050 4450
-Wire Wire Line
-	3200 4750 4350 4750
-Wire Wire Line
-	3200 4950 4050 4950
-Wire Wire Line
-	3200 5450 4350 5450
-Wire Wire Line
-	4050 5850 3200 5850
-Wire Wire Line
-	3200 5650 4350 5650
-Wire Wire Line
-	5900 6050 4350 6050
-Wire Wire Line
-	5200 5700 5900 5700
-Wire Wire Line
-	5900 5400 5500 5400
-Wire Wire Line
-	5200 5200 5900 5200
-Wire Wire Line
-	5200 4950 5900 4950
-Wire Wire Line
-	5500 4650 5900 4650
-Wire Wire Line
-	5200 4200 5900 4200
-Wire Wire Line
-	4050 4050 3200 4050
-$Comp
-L PORT U1
-U 7 1 5C9CB60F
-P 2950 5650
-F 0 "U1" H 3000 5750 30  0000 C CNN
-F 1 "PORT" H 2950 5650 30  0000 C CNN
-F 2 "" H 2950 5650 60  0000 C CNN
-F 3 "" H 2950 5650 60  0000 C CNN
-	7    2950 5650
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C9CB58F
-P 2950 4750
-F 0 "U1" H 3000 4850 30  0000 C CNN
-F 1 "PORT" H 2950 4750 30  0000 C CNN
-F 2 "" H 2950 4750 60  0000 C CNN
-F 3 "" H 2950 4750 60  0000 C CNN
-	4    2950 4750
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C9CB511
-P 2950 4050
-F 0 "U1" H 3000 4150 30  0000 C CNN
-F 1 "PORT" H 2950 4050 30  0000 C CNN
-F 2 "" H 2950 4050 60  0000 C CNN
-F 3 "" H 2950 4050 60  0000 C CNN
-	2    2950 4050
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 8 1 5C9CBE1D
-P 2950 5850
-F 0 "U1" H 3000 5950 30  0000 C CNN
-F 1 "PORT" H 2950 5850 30  0000 C CNN
-F 2 "" H 2950 5850 60  0000 C CNN
-F 3 "" H 2950 5850 60  0000 C CNN
-	8    2950 5850
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 16 1 5D0DDF9F
-P 6200 3950
-F 0 "U1" H 6250 4050 30  0000 C CNN
-F 1 "PORT" H 6200 3950 30  0000 C CNN
-F 2 "" H 6200 3950 60  0000 C CNN
-F 3 "" H 6200 3950 60  0000 C CNN
-	16   6200 3950
-	-1   0    0    1   
-$EndComp
-NoConn ~ 5950 3950
-$Comp
-L eSim_NPN Q3
-U 1 1 5C98F006
-P 4250 5850
-F 0 "Q3" H 4150 5900 50  0000 R CNN
-F 1 "eSim_NPN" H 4200 6000 50  0000 R CNN
-F 2 "" H 4450 5950 29  0000 C CNN
-F 3 "" H 4250 5850 60  0000 C CNN
-	1    4250 5850
-	1    0    0    1   
-$EndComp
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.sub b/src/SubcircuitLibrary/CA3096/CA3096.sub
deleted file mode 100644
index f79667b7..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.sub
+++ /dev/null
@@ -1,13 +0,0 @@
-* Subcircuit CA3096
-.subckt CA3096 net-_q1-pad2_ net-_q1-pad3_ net-_q1-pad1_ net-_q2-pad3_ net-_q2-pad2_ net-_q2-pad1_ net-_q3-pad3_ net-_q3-pad2_ net-_q3-pad1_ net-_q4-pad3_ net-_q5-pad2_ net-_q5-pad1_ net-_q5-pad3_ net-_q4-pad2_ net-_q4-pad1_ ? 
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ca3096/ca3096.cir
-.include PNP.lib
-.include NPN.lib
-q1 net-_q1-pad1_ net-_q1-pad2_ net-_q1-pad3_ Q2N2222
-q2 net-_q2-pad1_ net-_q2-pad2_ net-_q2-pad3_ Q2N2222
-q5 net-_q5-pad1_ net-_q5-pad2_ net-_q5-pad3_ Q2N2907A
-q4 net-_q4-pad1_ net-_q4-pad2_ net-_q4-pad3_ Q2N2907A
-q3 net-_q3-pad1_ net-_q3-pad2_ net-_q3-pad3_ Q2N2222
-* Control Statements
-
-.ends CA3096
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/CA3096/CA3096.xml b/src/SubcircuitLibrary/CA3096/CA3096.xml
deleted file mode 100644
index 24f50baa..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<export version="D">
-  <design>
-    <source>C:/esim_1/eSim/src/SubcircuitLibrary/CA3096/CA3096.sch</source>
-    <date>03/31/19 09:48:27</date>
-    <tool>Eeschema 4.0.2-stable</tool>
-    <sheet number="1" name="/" tstamps="/">
-      <title_block>
-        <title/>
-        <company/>
-        <rev/>
-        <date/>
-        <source>CA3096.sch</source>
-        <comment number="1" value=""/>
-        <comment number="2" value=""/>
-        <comment number="3" value=""/>
-        <comment number="4" value=""/>
-      </title_block>
-    </sheet>
-  </design>
-  <components>
-    <comp ref="Q1">
-      <value>eSim_NPN</value>
-      <libsource lib="eSim_Devices" part="eSim_NPN"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98EEF5</tstamp>
-    </comp>
-    <comp ref="Q2">
-      <value>eSim_NPN</value>
-      <libsource lib="eSim_Devices" part="eSim_NPN"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98EFC9</tstamp>
-    </comp>
-    <comp ref="Q3">
-      <value>eSim_NPN</value>
-      <libsource lib="eSim_Devices" part="eSim_NPN"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98F006</tstamp>
-    </comp>
-    <comp ref="Q5">
-      <value>eSim_PNP</value>
-      <libsource lib="eSim_Devices" part="eSim_PNP"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98F076</tstamp>
-    </comp>
-    <comp ref="Q4">
-      <value>eSim_PNP</value>
-      <libsource lib="eSim_Devices" part="eSim_PNP"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98F0A7</tstamp>
-    </comp>
-    <comp ref="U1">
-      <value>PORT</value>
-      <libsource lib="eSim_Miscellaneous" part="PORT"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5C98F1D4</tstamp>
-    </comp>
-  </components>
-  <libparts>
-    <libpart lib="eSim_Miscellaneous" part="PORT">
-      <fields>
-        <field name="Reference">U</field>
-        <field name="Value">PORT</field>
-      </fields>
-      <pins>
-        <pin num="1" name="~" type="input"/>
-        <pin num="2" name="~" type="input"/>
-        <pin num="3" name="~" type="input"/>
-        <pin num="4" name="~" type="input"/>
-        <pin num="5" name="~" type="input"/>
-        <pin num="6" name="~" type="input"/>
-        <pin num="7" name="~" type="input"/>
-        <pin num="8" name="~" type="input"/>
-        <pin num="9" name="~" type="input"/>
-        <pin num="10" name="~" type="input"/>
-        <pin num="11" name="~" type="input"/>
-        <pin num="12" name="~" type="input"/>
-        <pin num="13" name="~" type="input"/>
-        <pin num="14" name="~" type="input"/>
-        <pin num="15" name="~" type="input"/>
-        <pin num="16" name="~" type="input"/>
-        <pin num="17" name="~" type="input"/>
-        <pin num="18" name="~" type="input"/>
-        <pin num="19" name="~" type="input"/>
-        <pin num="20" name="~" type="input"/>
-        <pin num="21" name="~" type="input"/>
-        <pin num="22" name="~" type="input"/>
-        <pin num="23" name="~" type="input"/>
-        <pin num="24" name="~" type="input"/>
-        <pin num="25" name="~" type="input"/>
-        <pin num="26" name="~" type="input"/>
-      </pins>
-    </libpart>
-    <libpart lib="eSim_Devices" part="eSim_NPN">
-      <aliases>
-        <alias>BC547</alias>
-        <alias>Q2N2222</alias>
-      </aliases>
-      <fields>
-        <field name="Reference">Q</field>
-        <field name="Value">eSim_NPN</field>
-      </fields>
-      <pins>
-        <pin num="1" name="C" type="openCol"/>
-        <pin num="2" name="B" type="input"/>
-        <pin num="3" name="E" type="openEm"/>
-      </pins>
-    </libpart>
-    <libpart lib="eSim_Devices" part="eSim_PNP">
-      <fields>
-        <field name="Reference">Q</field>
-        <field name="Value">eSim_PNP</field>
-      </fields>
-      <pins>
-        <pin num="1" name="C" type="openCol"/>
-        <pin num="2" name="B" type="input"/>
-        <pin num="3" name="E" type="openEm"/>
-      </pins>
-    </libpart>
-  </libparts>
-  <libraries>
-    <library logical="eSim_Devices">
-      <uri>C:\Program Files (x86)\KiCad\share\library\eSim_Devices.lib</uri>
-    </library>
-    <library logical="eSim_Miscellaneous">
-      <uri>C:\Program Files (x86)\KiCad\share\library\eSim_Miscellaneous.lib</uri>
-    </library>
-  </libraries>
-  <nets>
-    <net code="1" name="Net-(Q5-Pad2)">
-      <node ref="U1" pin="11"/>
-      <node ref="Q5" pin="2"/>
-    </net>
-    <net code="2" name="Net-(Q2-Pad2)">
-      <node ref="U1" pin="5"/>
-      <node ref="Q2" pin="2"/>
-    </net>
-    <net code="3" name="Net-(Q3-Pad2)">
-      <node ref="U1" pin="8"/>
-      <node ref="Q3" pin="2"/>
-    </net>
-    <net code="4" name="Net-(Q4-Pad2)">
-      <node ref="U1" pin="14"/>
-      <node ref="Q4" pin="2"/>
-    </net>
-    <net code="5" name="Net-(Q1-Pad1)">
-      <node ref="U1" pin="3"/>
-      <node ref="Q1" pin="1"/>
-    </net>
-    <net code="6" name="Net-(Q2-Pad3)">
-      <node ref="Q2" pin="3"/>
-      <node ref="U1" pin="4"/>
-    </net>
-    <net code="7" name="Net-(Q3-Pad3)">
-      <node ref="Q3" pin="3"/>
-      <node ref="U1" pin="7"/>
-    </net>
-    <net code="8" name="Net-(Q3-Pad1)">
-      <node ref="U1" pin="9"/>
-      <node ref="Q3" pin="1"/>
-    </net>
-    <net code="9" name="Net-(Q5-Pad1)">
-      <node ref="U1" pin="12"/>
-      <node ref="Q5" pin="1"/>
-    </net>
-    <net code="10" name="Net-(Q1-Pad2)">
-      <node ref="U1" pin="1"/>
-      <node ref="Q1" pin="2"/>
-    </net>
-    <net code="11" name="Net-(Q1-Pad3)">
-      <node ref="U1" pin="2"/>
-      <node ref="Q1" pin="3"/>
-    </net>
-    <net code="12" name="Net-(Q2-Pad1)">
-      <node ref="Q2" pin="1"/>
-      <node ref="U1" pin="6"/>
-    </net>
-    <net code="13" name="Net-(Q5-Pad3)">
-      <node ref="Q5" pin="3"/>
-      <node ref="U1" pin="13"/>
-    </net>
-    <net code="14" name="Net-(Q4-Pad1)">
-      <node ref="U1" pin="15"/>
-      <node ref="Q4" pin="1"/>
-    </net>
-    <net code="15" name="Net-(Q4-Pad3)">
-      <node ref="Q4" pin="3"/>
-      <node ref="U1" pin="10"/>
-    </net>
-  </nets>
-</export>
diff --git a/src/SubcircuitLibrary/CA3096/CA3096_Previous_Values.xml b/src/SubcircuitLibrary/CA3096/CA3096_Previous_Values.xml
deleted file mode 100644
index 82a40fb6..00000000
--- a/src/SubcircuitLibrary/CA3096/CA3096_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model /><devicemodel><q1><field>/home/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/NPN.lib</field></q1><q3><field>/home/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/NPN.lib</field></q3><q2><field>/home/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/NPN.lib</field></q2><q5><field>/home/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/PNP.lib</field></q5><q4><field>/home/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/PNP.lib</field></q4></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/CA3096/D.lib b/src/SubcircuitLibrary/CA3096/D.lib
deleted file mode 100644
index 8a7fb4da..00000000
--- a/src/SubcircuitLibrary/CA3096/D.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-.model 1n4148 D(is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
-
diff --git a/src/SubcircuitLibrary/CA3096/NPN.lib b/src/SubcircuitLibrary/CA3096/NPN.lib
deleted file mode 100644
index 6509fe7a..00000000
--- a/src/SubcircuitLibrary/CA3096/NPN.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2222  NPN( Is=14.34f Xti=3 Eg=1.11 Vaf=74.03 Bf=400 Ne=1.307 
-+ Ise=14.34f Ikf=.2847 Xtb=1.5 Br=6.092 Nc=2 Isc=0 Ikr=0 Rc=1 Cjc=7.306p 
-+ Mjc=.3416 Vjc=.75 Fc=.5 Cje=22.01p Mje=.377 Vje=.75 Tr=46.91n Tf=411.1p 
-+ Itf=.6 Vtf=1.7 Xtf=3 Rb=10) 
diff --git a/src/SubcircuitLibrary/CA3096/PNP.lib b/src/SubcircuitLibrary/CA3096/PNP.lib
deleted file mode 100644
index 7edda0ea..00000000
--- a/src/SubcircuitLibrary/CA3096/PNP.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-.model Q2N2907A PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=231.7 Ne=1.829
-+		Ise=54.81f Ikf=1.079 Xtb=1.5 Br=3.563 Nc=2 Isc=0 Ikr=0 Rc=.715
-+		Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75
-+		Tr=111.3n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)
diff --git a/src/SubcircuitLibrary/CA3096/analysis b/src/SubcircuitLibrary/CA3096/analysis
deleted file mode 100644
index d5e13546..00000000
--- a/src/SubcircuitLibrary/CA3096/analysis
+++ /dev/null
@@ -1 +0,0 @@
-.tran 10e-03 100e-03 0e-00
\ No newline at end of file