Merge pull request #114 from sunilshetye/masterfixes

Master fixes

40 files changed, 356 insertions, 2189 deletions

diff --git a/src/SubcircuitLibrary/diac/diac-cache.lib b/src/SubcircuitLibrary/diac/diac-cache.lib
deleted file mode 100644
index b15fdeec..00000000
--- a/src/SubcircuitLibrary/diac/diac-cache.lib
+++ /dev/null
@@ -1,67 +0,0 @@
-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 60 H V C CNN
-F3 "" 0 0 60 H V 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 8 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
-ENDDRAW
-ENDDEF
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 95 50 H I C CNN
-F1 "PWR_FLAG" 0 180 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-X pwr 1 0 0 0 U 20 20 0 0 w
-P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
-ENDDRAW
-ENDDEF
-#
-# aswitch
-#
-DEF aswitch U 0 40 Y Y 1 F N
-F0 "U" 450 300 60 H V C CNN
-F1 "aswitch" 450 200 60 H V C CNN
-F2 "" 450 100 60 H V C CNN
-F3 "" 450 100 60 H V C CNN
-DRAW
-S 200 250 650 100 0 1 0 N
-X ~ 2 0 150 200 R 50 50 1 1 O
-X ~ 3 850 150 200 L 50 50 1 1 O
-X ~ 1_IN 450 -100 200 U 50 20 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/diac/diac.bak b/src/SubcircuitLibrary/diac/diac.bak
deleted file mode 100644
index 16009984..00000000
--- a/src/SubcircuitLibrary/diac/diac.bak
+++ /dev/null
@@ -1,138 +0,0 @@
-EESchema Schematic File Version 2  date 09/22/14 16:36:31

-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:analogXSpice

-LIBS:convergenceAidSpice

-LIBS:converterSpice

-LIBS:digitalSpice

-LIBS:digitalXSpice

-LIBS:linearSpice

-LIBS:measurementSpice

-LIBS:portSpice

-LIBS:sourcesSpice

-LIBS:diac-cache

-EELAYER 25  0

-EELAYER END

-$Descr A4 11700 8267

-encoding utf-8

-Sheet 1 1

-Title ""

-Date "22 sep 2014"

-Rev ""

-Comp ""

-Comment1 ""

-Comment2 ""

-Comment3 ""

-Comment4 ""

-$EndDescr

-Wire Wire Line

-	4150 2750 4150 3450

-Connection ~ 4400 3750

-Wire Wire Line

-	4900 4250 4900 4450

-Wire Wire Line

-	4900 4450 4400 4450

-Wire Wire Line

-	4400 4450 4400 3450

-Wire Wire Line

-	5200 3400 5200 4050

-Connection ~ 4600 3400

-Wire Wire Line

-	4600 4050 4600 2750

-Wire Wire Line

-	4600 2750 4150 2750

-Wire Wire Line

-	4150 3250 4150 3600

-Wire Wire Line

-	4400 3450 4150 3450

-Connection ~ 4150 3450

-Wire Wire Line

-	4400 3750 4900 3750

-Wire Wire Line

-	4900 3750 4900 3600

-Wire Wire Line

-	4150 4100 4150 4300

-$Comp

-L PWR_FLAG #FLG01

-U 1 1 5417D647

-P 4150 4300

-F 0 "#FLG01" H 4150 4570 30  0001 C CNN

-F 1 "PWR_FLAG" H 4150 4530 30  0000 C CNN

-	1    4150 4300

-	0    1    1    0   

-$EndComp

-$Comp

-L PORT U3

-U 2 1 5417D62C

-P 5450 3400

-F 0 "U3" H 5450 3350 30  0000 C CNN

-F 1 "PORT" H 5450 3400 30  0000 C CNN

-	2    5450 3400

-	-1   0    0    1   

-$EndComp

-$Comp

-L PORT U3

-U 1 1 5417D624

-P 4150 2500

-F 0 "U3" H 4150 2450 30  0000 C CNN

-F 1 "PORT" H 4150 2500 30  0000 C CNN

-	1    4150 2500

-	0    1    1    0   

-$EndComp

-$Comp

-L GND #PWR02

-U 1 1 5417D5DC

-P 4150 4300

-F 0 "#PWR02" H 4150 4300 30  0001 C CNN

-F 1 "GND" H 4150 4230 30  0001 C CNN

-	1    4150 4300

-	1    0    0    -1  

-$EndComp

-$Comp

-L ANALOGSWITCH U2

-U 1 1 5417D537

-P 4900 4050

-F 0 "U2" H 4700 4100 30  0000 C CNN

-F 1 "ANALOGSWITCH" H 4900 4050 30  0000 C CNN

-	1    4900 4050

-	1    0    0    -1  

-$EndComp

-$Comp

-L ANALOGSWITCH U1

-U 1 1 5417D530

-P 4900 3400

-F 0 "U1" H 4700 3450 30  0000 C CNN

-F 1 "ANALOGSWITCH" H 4900 3400 30  0000 C CNN

-	1    4900 3400

-	1    0    0    -1  

-$EndComp

-$EndSCHEMATC

diff --git a/src/SubcircuitLibrary/diac/diac.cir.ckt b/src/SubcircuitLibrary/diac/diac.cir.ckt
deleted file mode 100644
index e89f9cfb..00000000
--- a/src/SubcircuitLibrary/diac/diac.cir.ckt
+++ /dev/null
@@ -1,9 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: 09/22/14 16:36:23

-

-u3  1 2 port

-* Analog Switch analogswitch

-* Analog Switch analogswitch

-a1 1 (1 2) u2

-.model u2 aswitch(cntl_on=-25 cntl_off=-0.1 r_on=0.0125 r_off=1000000)

-a2 1 (1 2) u1

-.model u1 aswitch(cntl_on=25 cntl_off=0.1 r_on=0.0125 r_off=1000000)

diff --git a/src/SubcircuitLibrary/diac/diac.cir.out~ b/src/SubcircuitLibrary/diac/diac.cir.out~
deleted file mode 100644
index 89cc8142..00000000
--- a/src/SubcircuitLibrary/diac/diac.cir.out~
+++ /dev/null
@@ -1,24 +0,0 @@
-* /opt/esim/src/subcircuitlibrary/diac/diac.cir
-
-* u3  1 2 port
-* u1  1 1 2 aswitch
-* u2  1 1 2 aswitch
-a1 1 [1 2 ] u1
-a2 1 [1 2 ] u2
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=25 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-25 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=25 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-25 r_on=0.0125 r_off=1000000 ) 
-.tran 0e-00 0e-00 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/diac/diac.sub~ b/src/SubcircuitLibrary/diac/diac.sub~
deleted file mode 100644
index 43c2d279..00000000
--- a/src/SubcircuitLibrary/diac/diac.sub~
+++ /dev/null
@@ -1,18 +0,0 @@
-* Subcircuit diac
-.subckt diac 1 2 
-* /opt/esim/src/subcircuitlibrary/diac/diac.cir
-* u1  1 1 2 aswitch
-* u2  1 1 2 aswitch
-a1 1 [1 2 ] u1
-a2 1 [1 2 ] u2
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=25 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-25 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=25 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-25 r_on=0.0125 r_off=1000000 )
-* Control Statements
-
-.ends diac
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/full_adder/full_adder-cache.lib b/src/SubcircuitLibrary/full_adder/full_adder-cache.lib
deleted file mode 100644
index 623a7f41..00000000
--- a/src/SubcircuitLibrary/full_adder/full_adder-cache.lib
+++ /dev/null
@@ -1,61 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 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
-ENDDRAW
-ENDDEF
-#
-# d_or
-#
-DEF d_or U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_or" 0 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
-A -25 -124 325 574 323 0 1 0 N 150 150 250 50
-A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0  -250 -50  150 -50 N
-P 2 0 1 0  -250 150  150 150 N
-X IN1 1 -450 100 215 R 50 50 1 1 I
-X IN2 2 -450 0 215 R 50 50 1 1 I
-X OUT 3 450 50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# half_adder
-#
-DEF half_adder X 0 40 Y Y 1 F N
-F0 "X" 900 500 60 H V C CNN
-F1 "half_adder" 900 400 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S 500 800 1250 0 0 1 0 N
-X IN1 1 300 700 200 R 50 50 1 1 I
-X IN2 2 300 100 200 R 50 50 1 1 I
-X SUM 3 1450 700 200 L 50 50 1 1 O
-X COUT 4 1450 100 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/full_adder/full_adder.pro b/src/SubcircuitLibrary/full_adder/full_adder.pro
index c0db0775..0bd0d5af 100644
--- a/src/SubcircuitLibrary/full_adder/full_adder.pro
+++ b/src/SubcircuitLibrary/full_adder/full_adder.pro
@@ -61,9 +61,9 @@ 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
+LibName31=eSim_Analog
+LibName32=eSim_Devices
+LibName33=eSim_Digital
+LibName34=eSim_Hybrid
+LibName35=eSim_Sources
+LibName36=eSim_Subckt
diff --git a/src/SubcircuitLibrary/full_adder/half_adder-cache.lib b/src/SubcircuitLibrary/full_adder/half_adder-cache.lib
deleted file mode 100644
index 68785220..00000000
--- a/src/SubcircuitLibrary/full_adder/half_adder-cache.lib
+++ /dev/null
@@ -1,63 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 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
-ENDDRAW
-ENDDEF
-#
-# d_and
-#
-DEF d_and U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_and" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
-A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
-X IN1 1 -450 100 200 R 50 50 1 1 I
-X IN2 2 -450 0 200 R 50 50 1 1 I
-X OUT 3 450 50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# d_xor
-#
-DEF d_xor U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_xor" 50 100 47 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
-A -350 50 180 -337 337 0 1 0 N -200 -50 -200 150
-A -25 -124 325 574 323 0 1 0 N 150 150 250 50
-A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0  150 -50  -200 -50 N
-P 2 0 1 0  150 150  -200 150 N
-X IN1 1 -450 100 215 R 50 43 1 1 I
-X IN2 2 -450 0 215 R 50 43 1 1 I
-X OUT 3 450 50 200 L 50 39 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/full_adder/half_adder.pro b/src/SubcircuitLibrary/full_adder/half_adder.pro
index 695ae0f6..30094fb9 100644
--- a/src/SubcircuitLibrary/full_adder/half_adder.pro
+++ b/src/SubcircuitLibrary/full_adder/half_adder.pro
@@ -61,9 +61,9 @@ 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
+LibName31=eSim_Analog
+LibName32=eSim_Devices
+LibName33=eSim_Digital
+LibName34=eSim_Hybrid
+LibName35=eSim_Sources
+LibName36=eSim_Subckt
diff --git a/src/SubcircuitLibrary/half_adder/half_adder-cache.lib b/src/SubcircuitLibrary/half_adder/half_adder-cache.lib
deleted file mode 100644
index 68785220..00000000
--- a/src/SubcircuitLibrary/half_adder/half_adder-cache.lib
+++ /dev/null
@@ -1,63 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 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
-ENDDRAW
-ENDDEF
-#
-# d_and
-#
-DEF d_and U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_and" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
-A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
-X IN1 1 -450 100 200 R 50 50 1 1 I
-X IN2 2 -450 0 200 R 50 50 1 1 I
-X OUT 3 450 50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# d_xor
-#
-DEF d_xor U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_xor" 50 100 47 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
-A -350 50 180 -337 337 0 1 0 N -200 -50 -200 150
-A -25 -124 325 574 323 0 1 0 N 150 150 250 50
-A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0  150 -50  -200 -50 N
-P 2 0 1 0  150 150  -200 150 N
-X IN1 1 -450 100 215 R 50 43 1 1 I
-X IN2 2 -450 0 215 R 50 43 1 1 I
-X OUT 3 450 50 200 L 50 39 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/half_adder/half_adder.pro b/src/SubcircuitLibrary/half_adder/half_adder.pro
index 695ae0f6..30094fb9 100644
--- a/src/SubcircuitLibrary/half_adder/half_adder.pro
+++ b/src/SubcircuitLibrary/half_adder/half_adder.pro
@@ -61,9 +61,9 @@ 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
+LibName31=eSim_Analog
+LibName32=eSim_Devices
+LibName33=eSim_Digital
+LibName34=eSim_Hybrid
+LibName35=eSim_Sources
+LibName36=eSim_Subckt
diff --git a/src/SubcircuitLibrary/lm555n/lm555n-cache.lib b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
new file mode 100644
index 00000000..421c1147
--- /dev/null
+++ b/src/SubcircuitLibrary/lm555n/lm555n-cache.lib
@@ -0,0 +1,207 @@
+EESchema-LIBRARY Version 2.3  Date: Monday 17 December 2012 11:00:43 AM IST
+#encoding utf-8
+#
+# ADC8
+#
+DEF ADC8 U 0 10 Y Y 8 L N
+F0 "U" -100 100 40 H V C CNN
+F1 "ADC8" 0 0 40 H V C CNN
+DRAW
+S -150 50 150 -50 0 1 0 N
+X in1 1 -300 0 150 R 25 25 1 1 I
+X out1 9 300 0 150 L 25 25 1 1 O
+X in2 2 -300 0 150 R 25 25 2 1 I
+X out2 10 300 0 150 L 25 25 2 1 O
+X in3 3 -300 0 150 R 25 25 3 1 I
+X out3 11 300 0 150 L 25 25 3 1 O
+X in4 4 -300 0 150 R 25 25 4 1 I
+X out4 12 300 0 150 L 25 25 4 1 O
+X in5 5 -300 0 150 R 25 25 5 1 I
+X out5 13 300 0 150 L 25 25 5 1 O
+X in6 6 -300 0 150 R 25 25 6 1 I
+X out6 14 300 0 150 L 25 25 6 1 O
+X in7 7 -300 0 150 R 25 25 7 1 I
+X out7 15 300 0 150 L 25 25 7 1 O
+X in8 8 -300 0 150 R 25 25 8 1 I
+X out8 16 300 0 150 L 25 25 8 1 O
+ENDDRAW
+ENDDEF
+#
+# d_inverter
+#
+DEF d_inverter U 0 40 Y Y 1 F N
+F0 "U" -150 100 40 H V C CNN
+F1 "d_inverter" 100 100 40 H V C CNN
+DRAW
+P 4 0 1 0  -100 -100  -100 100  100 0  -100 -100 N
+X in 1 -250 0 150 R 25 25 1 1 I
+X out 2 250 0 150 L 25 25 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# D_SRLatch
+#
+DEF D_SRLatch U 0 40 Y Y 1 F N
+F0 "U" -200 250 60 H V C CNN
+F1 "D_SRLatch" 0 100 60 H V C CNN
+DRAW
+S -300 200 300 -200 0 1 0 N
+X S 1 -600 150 300 R 50 50 1 1 I
+X R 2 -600 -150 300 R 50 50 1 1 I
+X Enable 3 -600 0 300 R 50 50 1 1 I
+X Set 4 150 -500 300 U 50 50 1 1 I
+X Reset 5 -150 -500 300 U 50 50 1 1 I
+X Q 6 600 150 300 L 50 50 1 1 O
+X ~Q 7 600 -150 300 L 50 50 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# DAC8
+#
+DEF DAC8 U 0 10 Y Y 8 L N
+F0 "U" -100 100 40 H V C CNN
+F1 "DAC8" 0 0 40 H V C CNN
+DRAW
+S -150 50 150 -50 0 1 0 N
+X in1 1 -300 0 150 R 25 25 1 1 I
+X out1 9 300 0 150 L 25 25 1 1 O
+X in2 2 -300 0 150 R 25 25 2 1 I
+X out2 10 300 0 150 L 25 25 2 1 O
+X in3 3 -300 0 150 R 25 25 3 1 I
+X out3 11 300 0 150 L 25 25 3 1 O
+X in4 4 -300 0 150 R 25 25 4 1 I
+X out4 12 300 0 150 L 25 25 4 1 O
+X in5 5 -300 0 150 R 25 25 5 1 I
+X out5 13 300 0 150 L 25 25 5 1 O
+X in6 6 -300 0 150 R 25 25 6 1 I
+X out6 14 300 0 150 L 25 25 6 1 O
+X in7 7 -300 0 150 R 25 25 7 1 I
+X out7 15 300 0 150 L 25 25 7 1 O
+X in8 8 -300 0 150 R 25 25 8 1 I
+X out8 16 300 0 150 L 25 25 8 1 O
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# LIMIT8
+#
+DEF LIMIT8 U 0 40 Y Y 8 F N
+F0 "U" 0 100 30 H V C CNN
+F1 "LIMIT8" 0 0 30 H V C CNN
+DRAW
+S -150 50 150 -50 0 1 0 N
+X in 1 -300 0 150 R 25 25 1 1 I
+X out 9 300 0 150 L 25 25 1 1 O
+X in 2 -300 0 150 R 25 25 2 1 I
+X out 10 300 0 150 L 25 25 2 1 O
+X in 3 -300 0 150 R 25 25 3 1 I
+X out 11 300 0 150 L 25 25 3 1 O
+X in 4 -300 0 150 R 25 25 4 1 I
+X out 12 300 0 150 L 25 25 4 1 O
+X in 5 -300 0 150 R 25 25 5 1 I
+X out 13 300 0 150 L 25 25 5 1 O
+X in 6 -300 0 150 R 25 25 6 1 I
+X out 14 300 0 150 L 25 25 6 1 O
+X in 7 -300 0 150 R 25 25 7 1 I
+X out 15 300 0 150 L 25 25 7 1 O
+X in 8 -300 0 150 R 25 25 8 1 I
+X out 16 300 0 150 L 25 25 8 1 O
+ENDDRAW
+ENDDEF
+#
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 8 F N
+F0 "U" 0 -50 30 H V C CNN
+F1 "PORT" 0 0 30 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
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 270 30 H I C CNN
+F1 "PWR_FLAG" 0 230 30 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 3 0 1 0  0 0  0 100  0 100 N
+P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VCVS
+#
+DEF VCVS E 0 40 Y Y 1 F N
+F0 "E" -200 100 50 H V C CNN
+F1 "VCVS" -200 -50 50 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
+#
+#End Library
diff --git a/src/SubcircuitLibrary/lm555n/lm555n-rescue.lib b/src/SubcircuitLibrary/lm555n/lm555n-rescue.lib
new file mode 100644
index 00000000..2ed63bd8
--- /dev/null
+++ b/src/SubcircuitLibrary/lm555n/lm555n-rescue.lib
@@ -0,0 +1,37 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# GND-RESCUE-lm555n
+#
+DEF ~GND-RESCUE-lm555n #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND-RESCUE-lm555n" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# R-RESCUE-lm555n
+#
+DEF R-RESCUE-lm555n R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R-RESCUE-lm555n" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.bak b/src/SubcircuitLibrary/lm555n/lm555n.bak
deleted file mode 100644
index 92d1f7a7..00000000
--- a/src/SubcircuitLibrary/lm555n/lm555n.bak
+++ /dev/null
@@ -1,435 +0,0 @@
-EESchema Schematic File Version 2  date Monday 17 December 2012 10:48:46 AM IST
-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:analogXSpice
-LIBS:converterSpice
-LIBS:digitalSpice
-LIBS:linearSpice
-LIBS:measurementSpice
-LIBS:portSpice
-LIBS:sourcesSpice
-LIBS:digitalXSpice
-LIBS:lm555n-cache
-EELAYER 25  0
-EELAYER END
-$Descr A4 11700 8267
-encoding utf-8
-Sheet 1 1
-Title ""
-Date "17 dec 2012"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L D_INVERTER U5
-U 1 1 50CEA9C5
-P 6700 4050
-F 0 "U5" H 6550 4150 40  0000 C CNN
-F 1 "D_INVERTER" H 6800 4150 40  0000 C CNN
-	1    6700 4050
-	1    0    0    -1  
-$EndComp
-$Comp
-L D_SRLATCH U6
-U 1 1 50CEA9AE
-P 7100 3400
-F 0 "U6" H 6900 3650 60  0000 C CNN
-F 1 "D_SRLATCH" H 7100 3500 60  0000 C CNN
-	1    7100 3400
-	1    0    0    -1  
-$EndComp
-Text Notes 5750 3050 0    60   ~ 0
-IC 555
-Wire Wire Line
-	4700 3000 4900 3000
-Wire Wire Line
-	4700 4750 4700 4650
-Connection ~ 4400 3550
-Connection ~ 4400 4900
-Wire Wire Line
-	4300 4900 7700 4900
-Wire Wire Line
-	4400 4200 4400 4100
-Wire Wire Line
-	7700 4900 7700 4800
-Wire Wire Line
-	7700 3250 7850 3250
-Wire Wire Line
-	7400 4600 7100 4600
-Wire Wire Line
-	7100 4600 7100 4250
-Wire Wire Line
-	7700 3650 7700 3550
-Wire Wire Line
-	6350 4050 6450 4050
-Wire Wire Line
-	6950 3900 6950 4000
-Wire Wire Line
-	7150 4000 7150 4050
-Wire Wire Line
-	7150 4050 6950 4050
-Wire Wire Line
-	6500 3550 6200 3550
-Wire Wire Line
-	6350 3250 6500 3250
-Wire Wire Line
-	5400 3250 5100 3250
-Wire Wire Line
-	5100 3250 5100 3750
-Wire Wire Line
-	5550 4500 5550 4350
-Wire Wire Line
-	5700 3550 5800 3550
-Wire Wire Line
-	5900 3250 6000 3250
-Wire Wire Line
-	6000 3850 6350 3850
-Wire Wire Line
-	5800 4150 6200 4150
-Wire Wire Line
-	5200 3550 5200 3700
-Wire Wire Line
-	5200 3700 5550 3700
-Wire Wire Line
-	5550 3700 5550 3750
-Connection ~ 5550 4450
-Wire Wire Line
-	5750 4400 5750 4450
-Wire Wire Line
-	5100 4350 5100 4450
-Wire Wire Line
-	5100 4450 5750 4450
-Wire Wire Line
-	6500 3400 6450 3400
-Wire Wire Line
-	6450 3400 6450 4050
-Wire Wire Line
-	6950 4000 7250 4000
-Wire Wire Line
-	7250 4000 7250 3900
-Connection ~ 7150 4000
-Wire Wire Line
-	7600 4250 7700 4250
-Wire Wire Line
-	7700 4400 7700 4350
-Wire Wire Line
-	7700 4350 7800 4350
-Wire Wire Line
-	7850 3850 7900 3850
-Wire Wire Line
-	4400 4900 4400 4700
-Wire Wire Line
-	4400 3600 4400 3500
-Wire Wire Line
-	4300 3000 4400 3000
-Wire Wire Line
-	4400 4150 4700 4150
-Connection ~ 4400 4150
-Wire Wire Line
-	4300 3550 4700 3550
-Wire Wire Line
-	4700 3550 4700 3500
-Wire Wire Line
-	6350 4750 6350 4650
-Text Label 4850 4100 0    60   ~ 0
-d
-$Comp
-L VCVS E2
-U 1 1 50AA12FF
-P 5050 4050
-F 0 "E2" H 4850 4150 50  0000 C CNN
-F 1 "10000" H 4850 4000 50  0000 C CNN
-	1    5050 4050
-	0    1    1    0   
-$EndComp
-$Comp
-L LIMIT8 U4
-U 2 1 50B4E21B
-P 6000 3550
-F 0 "U4" H 6000 3650 30  0000 C CNN
-F 1 "LIMIT8" H 6000 3550 30  0000 C CNN
-	2    6000 3550
-	0    1    1    0   
-$EndComp
-$Comp
-L LIMIT8 U4
-U 1 1 50B4E215
-P 5800 3850
-F 0 "U4" H 5800 3950 30  0000 C CNN
-F 1 "LIMIT8" H 5800 3850 30  0000 C CNN
-	1    5800 3850
-	0    1    1    0   
-$EndComp
-$Comp
-L DAC8 U3
-U 2 1 50AAFCE7
-P 7700 3950
-F 0 "U3" H 7600 4050 40  0000 C CNN
-F 1 "DAC8" H 7700 3950 40  0000 C CNN
-	2    7700 3950
-	0    1    1    0   
-$EndComp
-$Comp
-L DAC8 U3
-U 1 1 50AAFC9A
-P 7850 3550
-F 0 "U3" H 7750 3650 40  0000 C CNN
-F 1 "DAC8" H 7850 3550 40  0000 C CNN
-	1    7850 3550
-	0    1    1    0   
-$EndComp
-$Comp
-L ADC8 U2
-U 3 1 50AAFB76
-P 6350 4350
-F 0 "U2" H 6250 4450 40  0000 C CNN
-F 1 "ADC8" H 6350 4350 40  0000 C CNN
-	3    6350 4350
-	0    -1   -1   0   
-$EndComp
-$Comp
-L ADC8 U2
-U 2 1 50AAFB64
-P 6350 3550
-F 0 "U2" H 6250 3650 40  0000 C CNN
-F 1 "ADC8" H 6350 3550 40  0000 C CNN
-	2    6350 3550
-	0    -1   -1   0   
-$EndComp
-$Comp
-L ADC8 U2
-U 1 1 50AAFB55
-P 6200 3850
-F 0 "U2" H 6100 3950 40  0000 C CNN
-F 1 "ADC8" H 6200 3850 40  0000 C CNN
-	1    6200 3850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L PWR_FLAG #FLG01
-U 1 1 50AA39A3
-P 5750 4400
-F 0 "#FLG01" H 5750 4670 30  0001 C CNN
-F 1 "PWR_FLAG" H 5750 4630 30  0000 C CNN
-	1    5750 4400
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 5 1 50AA2210
-P 4050 3550
-F 0 "U1" H 4050 3500 30  0000 C CNN
-F 1 "PORT" H 4050 3550 30  0000 C CNN
-	5    4050 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 1 1 50AA21C7
-P 4050 4900
-F 0 "U1" H 4050 4850 30  0000 C CNN
-F 1 "PORT" H 4050 4900 30  0000 C CNN
-	1    4050 4900
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 2 1 50AA21BC
-P 4700 5000
-F 0 "U1" H 4700 4950 30  0000 C CNN
-F 1 "PORT" H 4700 5000 30  0000 C CNN
-	2    4700 5000
-	0    -1   -1   0   
-$EndComp
-$Comp
-L PORT U1
-U 4 1 50AA21A9
-P 6350 5000
-F 0 "U1" H 6350 4950 30  0000 C CNN
-F 1 "PORT" H 6350 5000 30  0000 C CNN
-	4    6350 5000
-	0    -1   -1   0   
-$EndComp
-$Comp
-L PORT U1
-U 7 1 50AA21A0
-P 8050 4350
-F 0 "U1" H 8050 4300 30  0000 C CNN
-F 1 "PORT" H 8050 4350 30  0000 C CNN
-	7    8050 4350
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 3 1 50AA2181
-P 8150 3850
-F 0 "U1" H 8150 3800 30  0000 C CNN
-F 1 "PORT" H 8150 3850 30  0000 C CNN
-	3    8150 3850
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 6 1 50AA2171
-P 5150 3000
-F 0 "U1" H 5150 2950 30  0000 C CNN
-F 1 "PORT" H 5150 3000 30  0000 C CNN
-	6    5150 3000
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 8 1 50AA2162
-P 4050 3000
-F 0 "U1" H 4050 2950 30  0000 C CNN
-F 1 "PORT" H 4050 3000 30  0000 C CNN
-	8    4050 3000
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R8
-U 1 1 50AA20DA
-P 7350 4250
-F 0 "R8" V 7430 4250 50  0000 C CNN
-F 1 "1500" V 7350 4250 50  0000 C CNN
-	1    7350 4250
-	0    1    1    0   
-$EndComp
-$Comp
-L NPN Q1
-U 1 1 50AA2050
-P 7600 4600
-F 0 "Q1" H 7600 4450 50  0000 R CNN
-F 1 "QNOM" H 7600 4750 50  0000 R CNN
-	1    7600 4600
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR02
-U 1 1 50AA140C
-P 5550 4500
-F 0 "#PWR02" H 5550 4500 30  0001 C CNN
-F 1 "GND" H 5550 4430 30  0001 C CNN
-	1    5550 4500
-	1    0    0    -1  
-$EndComp
-Text Label 4850 4000 0    60   ~ 0
-c
-Text Label 4700 4650 0    60   ~ 0
-d
-Text Label 4700 4150 0    60   ~ 0
-c
-$Comp
-L R R7
-U 1 1 50AA12F7
-P 5650 3250
-F 0 "R7" V 5730 3250 50  0000 C CNN
-F 1 "25" V 5650 3250 50  0000 C CNN
-	1    5650 3250
-	0    -1   -1   0   
-$EndComp
-$Comp
-L R R6
-U 1 1 50AA12B0
-P 5450 3550
-F 0 "R6" V 5530 3550 50  0000 C CNN
-F 1 "25" V 5450 3550 50  0000 C CNN
-	1    5450 3550
-	0    -1   -1   0   
-$EndComp
-Text Label 5300 4000 0    60   ~ 0
-b
-Text Label 5300 4100 0    60   ~ 0
-a
-Text Label 4700 3000 0    60   ~ 0
-b
-Text Label 4700 3500 0    60   ~ 0
-a
-$Comp
-L VCVS E1
-U 1 1 50AA11B6
-P 5500 4050
-F 0 "E1" H 5300 4150 50  0000 C CNN
-F 1 "10000" H 5300 4000 50  0000 C CNN
-	1    5500 4050
-	0    1    1    0   
-$EndComp
-$Comp
-L R R4
-U 1 1 50A9E00B
-P 4700 3250
-F 0 "R4" V 4780 3250 50  0000 C CNN
-F 1 "2E6" V 4700 3250 50  0000 C CNN
-	1    4700 3250
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R5
-U 1 1 50A9E001
-P 4700 4400
-F 0 "R5" V 4780 4400 50  0000 C CNN
-F 1 "2E6" V 4700 4400 50  0000 C CNN
-	1    4700 4400
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R3
-U 1 1 50A9DF09
-P 4400 4450
-F 0 "R3" V 4480 4450 50  0000 C CNN
-F 1 "5000" V 4400 4450 50  0000 C CNN
-	1    4400 4450
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R2
-U 1 1 50A9DF03
-P 4400 3850
-F 0 "R2" V 4480 3850 50  0000 C CNN
-F 1 "5000" V 4400 3850 50  0000 C CNN
-	1    4400 3850
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R1
-U 1 1 50A9DEFE
-P 4400 3250
-F 0 "R1" V 4480 3250 50  0000 C CNN
-F 1 "5000" V 4400 3250 50  0000 C CNN
-	1    4400 3250
-	1    0    0    -1  
-$EndComp
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir b/src/SubcircuitLibrary/lm555n/lm555n.cir
index 8f6f81c6..144b7152 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir
+++ b/src/SubcircuitLibrary/lm555n/lm555n.cir
@@ -1,4 +1,4 @@
-* EESchema Netlist Version 1.1 (Spice format) creation date: Monday 17 December 2012 10:57:49 AM IST
+* EESchema Netlist Version 1.1 (Spice format) creation date: Monday 17 December 2012 11:00:36 AM IST
 
 * 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
@@ -7,9 +7,9 @@
 U5  5 21 D_INVERTER		
 U6  1 4 5 21 21 8 10 D_SRLATCH		
 E2  18 0 23 14 10000		
-*U4  19 20 11 12 LIMIT8		
-*U3  8 10 7 9 DAC8		
-*U2  11 12 6 4 1 5 ADC8		
+U4  19 20 11 12 LIMIT8		
+U3  8 10 7 9 DAC8		
+U2  11 12 6 4 1 5 ADC8		
 U1  22 14 7 6 15 16 3 13 PORT		
 R8  9 2 1500		
 Q1  22 2 3 QNOM		
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt b/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt
deleted file mode 100644
index 90f04a32..00000000
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir.ckt
+++ /dev/null
@@ -1,35 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
-
-* Inverter d_inverter
-* SR Latch d_srlatch
-e2  18 0 23 14 10000
-* Limiter limit8
-* Digital to Analog converter dac8
-* Analog to Digital converter adc8
-u1  22 14 7 6 15 16 3 13 port
-r8  9 2 1500
-q1 3 2 22 qnom
-r7  18 20 25
-r6  17 19 25
-e1  17 0 16 15 10000
-r4  16 15 2e6
-r5  23 14 2e6
-r3  23 22 5000
-r2  15 23 5000
-r1  13 15 5000
-a1 5 21 u5
-.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
-a2 1 4 5 21 21 8 10 u6
-.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
-+sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
-+sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
-a3 19 11 u4
-a4 20 12 u4
-.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0)
-a5 [8] [7] u3
-a6 [10] [9] u3
-.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
-a7 [11] [4] u2
-a8 [12] [1] u2
-a9 [6] [5] u2
-.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir.out b/src/SubcircuitLibrary/lm555n/lm555n.cir.out
index 21ca75a9..f45920fd 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir.out
+++ b/src/SubcircuitLibrary/lm555n/lm555n.cir.out
@@ -1,11 +1,14 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
 
-* u5  5 21 d_inverter
-* u6  1 4 5 21 21 8 10 d_srlatch
+* Inverter d_inverter
+* SR Latch d_srlatch
 e2  18 0 23 14 10000
-* u1  22 14 7 6 15 16 3 13 port
+* Limiter limit8
+* Digital to Analog converter dac8
+* Analog to Digital converter adc8
+u1  22 14 7 6 15 16 3 13 port
 r8  9 2 1500
-q1  22 2 3 qnom
+q1 3 2 22 qnom
 r7  18 20 25
 r6  17 19 25
 e1  17 0 16 15 10000
@@ -15,17 +18,18 @@ r3  23 22 5000
 r2  15 23 5000
 r1  13 15 5000
 a1 5 21 u5
+.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
 a2 1 4 5 21 21 8 10 u6
-* Schematic Name: d_inverter, NgSpice Name: d_inverter
-.model u5 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 ) 
-* Schematic Name: d_srlatch, NgSpice Name: d_srlatch
-.model u6 d_srlatch(ic=0 sr_load=1.0e-12 set_delay=1.0e-9 set_load=1.0e-12 sr_delay=1.0e-9 reset_load=1.0e-12 enable_delay=1.0e-9 reset_delay=1.0e-9 rise_delay=1.0e-9 fall_delay=1.0e-9 enable_load=1.0e-12 ) 
-.ac oct 897897 kjadsfhHz jhdsakjHz
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
+.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
++sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
++sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
+a3 19 11 u4
+a4 20 12 u4
+.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
+a5 [8] [7] u3
+a6 [10] [9] u3
+.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
+a7 [11] [4] u2
+a8 [12] [1] u2
+a9 [6] [5] u2
+.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir.out~ b/src/SubcircuitLibrary/lm555n/lm555n.cir.out~
deleted file mode 100644
index bc50c640..00000000
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir.out~
+++ /dev/null
@@ -1,30 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
-
-* u5  5 21 d_inverter
-* u6  1 4 5 21 21 8 10 d_srlatch
-e2  18 0 23 14 10000
-r8  9 2 1500
-q1  22 2 3 qnom
-r7  18 20 25
-r6  17 19 25
-e1  17 0 16 15 10000
-r4  16 15 2e6
-r5  23 14 2e6
-r3  23 22 5000
-r2  15 23 5000
-r1  13 15 5000
-a1 5 21 u5
-a2 1 4 5 21 21 8 10 u6
-* Schematic Name: d_inverter, NgSpice Name: d_inverter
-.model u5 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 ) 
-* Schematic Name: d_srlatch, NgSpice Name: d_srlatch
-.model u6 d_srlatch(ic=0 sr_load=1.0e-12 set_delay=1.0e-9 set_load=1.0e-12 sr_delay=1.0e-9 reset_load=1.0e-12 enable_delay=1.0e-9 reset_delay=1.0e-9 rise_delay=1.0e-9 fall_delay=1.0e-9 enable_load=1.0e-12 ) 
-.ac lin 0 0Hz 0Hz
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.cir~ b/src/SubcircuitLibrary/lm555n/lm555n.cir~
deleted file mode 100644
index 7ef9e6a5..00000000
--- a/src/SubcircuitLibrary/lm555n/lm555n.cir~
+++ /dev/null
@@ -1,25 +0,0 @@
-* EESchema Netlist Version 1.1 (Spice format) creation date: Monday 17 December 2012 10:57:49 AM IST
-
-* 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:/
-U5  5 21 D_INVERTER		
-U6  1 4 5 21 21 8 10 D_SRLATCH		
-E2  18 0 23 14 10000		
-*U4  19 20 11 12 LIMIT8		
-*U3  8 10 7 9 DAC8		
-*U2  11 12 6 4 1 5 ADC8		
-*U1  22 14 7 6 15 16 3 13 PORT		
-R8  9 2 1500		
-Q1  22 2 3 QNOM		
-R7  18 20 25		
-R6  17 19 25		
-E1  17 0 16 15 10000		
-R4  16 15 2E6		
-R5  23 14 2E6		
-R3  23 22 5000		
-R2  15 23 5000		
-R1  13 15 5000		
-
-.end
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.pro b/src/SubcircuitLibrary/lm555n/lm555n.pro
index c8e151fb..1a966cc5 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.pro
+++ b/src/SubcircuitLibrary/lm555n/lm555n.pro
@@ -1,73 +1,46 @@
-update=Monday 19 November 2012 04:56:38 PM IST
+update=Thu May 19 16:58:03 2016
 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
+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=analogSpice
-LibName32=analogXSpice
-LibName33=converterSpice
-LibName34=digitalSpice
-LibName35=linearSpice
-LibName36=measurementSpice
-LibName37=portSpice
-LibName38=sourcesSpice
-LibName39=digitalXSpice
+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
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.sch b/src/SubcircuitLibrary/lm555n/lm555n.sch
index fabbb666..417063b1 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.sch
+++ b/src/SubcircuitLibrary/lm555n/lm555n.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Monday 17 December 2012 10:57:52 AM IST
+EESchema Schematic File Version 2  date Monday 17 December 2012 11:00:43 AM IST
 LIBS:power
 LIBS:device
 LIBS:transistors
diff --git a/src/SubcircuitLibrary/lm555n/lm555n.sub b/src/SubcircuitLibrary/lm555n/lm555n.sub
index 862626ea..beeefc43 100644
--- a/src/SubcircuitLibrary/lm555n/lm555n.sub
+++ b/src/SubcircuitLibrary/lm555n/lm555n.sub
@@ -1,11 +1,14 @@
 * Subcircuit lm555n
 .subckt lm555n 22 14 7 6 15 16 3 13 
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
-* u5  5 21 d_inverter
-* u6  1 4 5 21 21 8 10 d_srlatch
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
+* Inverter d_inverter
+* SR Latch d_srlatch
 e2  18 0 23 14 10000
+* Limiter limit8
+* Digital to Analog converter dac8
+* Analog to Digital converter adc8
 r8  9 2 1500
-q1  22 2 3 qnom
+q1 3 2 22 qnom
 r7  18 20 25
 r6  17 19 25
 e1  17 0 16 15 10000
@@ -15,11 +18,20 @@ r3  23 22 5000
 r2  15 23 5000
 r1  13 15 5000
 a1 5 21 u5
+.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
 a2 1 4 5 21 21 8 10 u6
-* Schematic Name: d_inverter, NgSpice Name: d_inverter
-.model u5 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_srlatch, NgSpice Name: d_srlatch
-.model u6 d_srlatch(ic=0 sr_load=1.0e-12 set_delay=1.0e-9 set_load=1.0e-12 sr_delay=1.0e-9 reset_load=1.0e-12 enable_delay=1.0e-9 reset_delay=1.0e-9 rise_delay=1.0e-9 fall_delay=1.0e-9 enable_load=1.0e-12 )
-* Control Statements
+.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
++sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
++sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
+a3 19 11 u4
+a4 20 12 u4
+.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
+a5 [8] [7] u3
+a6 [10] [9] u3
+.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
+a7 [11] [4] u2
+a8 [12] [1] u2
+a9 [6] [5] u2
+.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
 
 .ends lm555n
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/scr/D.lib b/src/SubcircuitLibrary/scr/D.lib
deleted file mode 100755
index ef18bb50..00000000
--- a/src/SubcircuitLibrary/scr/D.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-.MODEL D1N750 D(
-+  Vj=.75
-+  Nbvl=14.976
-+  Cjo=175p
-+  Rs=.25
-+  Isr=1.859n
-+  Eg=1.11
-+  M=.5516
-+  Nbv=1.6989
-+  N=1
-+  Tbv1=-21.277u
-+  Bv=8.1
-+  Fc=.5
-+  Ikf=0
-+  Nr=2
-+  Ibv=20.245m
-+  Is=880.5E-18
-+  Xti=3
-+  Ibvl=1.9556m
-)
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/scr/PowerDiode.lib b/src/SubcircuitLibrary/scr/PowerDiode.lib
index a2f61dce..d6fb6469 100644
--- a/src/SubcircuitLibrary/scr/PowerDiode.lib
+++ b/src/SubcircuitLibrary/scr/PowerDiode.lib
@@ -1,20 +1 @@
-.MODEL PowerDiode D(
-+ Vj=.75
-+ Nbvl=14.976
-+ Cjo=175p
-+ Rs=.25
-+ Isr=1.859n
-+ Eg=1.11
-+ M=.5516
-+ Nbv=1.6989
-+ N=1
-+ Tbv1=-21.277u
-+ bv=1800
-+ Fc=.5
-+ Ikf=0
-+ Nr=2
-+ Ibv=20.245m
-+ Is=2.2E-15
-+ Xti=3
-+ Ibvl=1.9556m
-)
\ No newline at end of file
+.MODEL PowerDiode D( Vj=.75 Nbvl=14.976 Cjo=175p Rs=.25 Isr=1.859n Eg=1.11 M=.5516 Nbv=1.6989 N=1 Tbv1=-21.277u bv=1800 Fc=.5 Ikf=0 Nr=2 Ibv=20.245m Is=2.2E-15 Xti=3 Ibvl=1.9556m )
diff --git a/src/SubcircuitLibrary/scr/scr.bak b/src/SubcircuitLibrary/scr/scr.bak
deleted file mode 100644
index 58b985d9..00000000
--- a/src/SubcircuitLibrary/scr/scr.bak
+++ /dev/null
@@ -1,243 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:analogSpice
-LIBS:analogXSpice
-LIBS:convergenceAidSpice
-LIBS:converterSpice
-LIBS:digitalSpice
-LIBS:digitalXSpice
-LIBS:measurementSpice
-LIBS:portSpice
-LIBS:sourcesSpice
-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:scr-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date "21 aug 2014"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-Wire Wire Line
-	3600 3250 3600 3150
-Connection ~ 5550 4950
-Wire Wire Line
-	5800 3900 5800 3850
-Wire Wire Line
-	5800 3850 6150 3850
-Wire Wire Line
-	6150 3850 6150 4950
-Wire Wire Line
-	6150 4950 3600 4950
-Connection ~ 4300 4950
-Wire Wire Line
-	4300 4950 4300 4050
-Wire Wire Line
-	4300 4050 3850 4050
-Wire Wire Line
-	4700 5950 4700 5450
-Wire Wire Line
-	4250 5950 4250 5500
-Connection ~ 4250 4950
-Wire Wire Line
-	4250 5000 4250 4950
-Wire Wire Line
-	5550 3600 5550 3450
-Wire Wire Line
-	5550 4950 5550 4250
-Wire Wire Line
-	3600 4950 3600 4400
-Wire Wire Line
-	3600 2650 3600 2300
-Wire Wire Line
-	3600 2300 3150 2300
-Wire Wire Line
-	3600 4150 3600 4300
-Wire Wire Line
-	5550 4150 5550 4000
-Wire Wire Line
-	5550 2550 5550 2250
-Wire Wire Line
-	4700 5050 4700 4950
-Connection ~ 4700 4950
-Wire Wire Line
-	6650 2000 6650 5950
-Connection ~ 4700 5950
-Wire Wire Line
-	3850 4650 3850 5950
-Wire Wire Line
-	3850 5950 6650 5950
-Connection ~ 4250 5950
-Wire Wire Line
-	5800 4500 5800 5950
-Connection ~ 5800 5950
-$Comp
-L PORT U2
-U 3 1 53F4C93D
-P 6650 2250
-F 0 "U2" H 6650 2200 30  0000 C CNN
-F 1 "PORT" H 6650 2250 30  0000 C CNN
-F 2 "" H 6650 2250 60  0001 C CNN
-F 3 "" H 6650 2250 60  0001 C CNN
-	3    6650 2250
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U2
-U 2 1 53F4C934
-P 2900 2300
-F 0 "U2" H 2900 2250 30  0000 C CNN
-F 1 "PORT" H 2900 2300 30  0000 C CNN
-F 2 "" H 2900 2300 60  0001 C CNN
-F 3 "" H 2900 2300 60  0001 C CNN
-	2    2900 2300
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U2
-U 1 1 53F4C92A
-P 6400 4950
-F 0 "U2" H 6400 4900 30  0000 C CNN
-F 1 "PORT" H 6400 4950 30  0000 C CNN
-F 2 "" H 6400 4950 60  0001 C CNN
-F 3 "" H 6400 4950 60  0001 C CNN
-	1    6400 4950
-	-1   0    0    1   
-$EndComp
-$Comp
-L CCCS F2
-U 1 1 53F4C735
-P 5750 4200
-F 0 "F2" H 5550 4300 50  0000 C CNN
-F 1 "100" H 5550 4150 50  0000 C CNN
-F 2 "" H 5750 4200 60  0001 C CNN
-F 3 "" H 5750 4200 60  0001 C CNN
-	1    5750 4200
-	0    1    1    0   
-$EndComp
-$Comp
-L DIODE D1
-U 1 1 53F4C6D9
-P 5550 3800
-F 0 "D1" H 5550 3900 40  0000 C CNN
-F 1 "D" H 5550 3700 40  0000 C CNN
-F 2 "" H 5550 3800 60  0001 C CNN
-F 3 "" H 5550 3800 60  0001 C CNN
-	1    5550 3800
-	0    1    1    0   
-$EndComp
-$Comp
-L C C1
-U 1 1 53F4C6C2
-P 4700 5250
-F 0 "C1" H 4750 5350 50  0000 L CNN
-F 1 "10u" H 4750 5150 50  0000 L CNN
-F 2 "" H 4700 5250 60  0001 C CNN
-F 3 "" H 4700 5250 60  0001 C CNN
-	1    4700 5250
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R2
-U 1 1 53F4C6BB
-P 4250 5250
-F 0 "R2" V 4330 5250 50  0000 C CNN
-F 1 "1" V 4250 5250 50  0000 C CNN
-F 2 "" H 4250 5250 60  0001 C CNN
-F 3 "" H 4250 5250 60  0001 C CNN
-	1    4250 5250
-	1    0    0    -1  
-$EndComp
-$Comp
-L CCCS F1
-U 1 1 53F4C67F
-P 3800 4350
-F 0 "F1" H 3600 4450 50  0000 C CNN
-F 1 "10" H 3600 4300 50  0000 C CNN
-F 2 "" H 3800 4350 60  0001 C CNN
-F 3 "" H 3800 4350 60  0001 C CNN
-	1    3800 4350
-	0    1    1    0   
-$EndComp
-$Comp
-L R R1
-U 1 1 53F4C5C9
-P 3600 2900
-F 0 "R1" V 3680 2900 50  0000 C CNN
-F 1 "50" V 3600 2900 50  0000 C CNN
-F 2 "" H 3600 2900 60  0001 C CNN
-F 3 "" H 3600 2900 60  0001 C CNN
-	1    3600 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L dc v1
-U 1 1 565DBF58
-P 3600 3700
-F 0 "v1" H 3400 3800 60  0000 C CNN
-F 1 "dc" H 3400 3650 60  0000 C CNN
-F 2 "R1" H 3300 3700 60  0000 C CNN
-F 3 "" H 3600 3700 60  0000 C CNN
-	1    3600 3700
-	1    0    0    -1  
-$EndComp
-$Comp
-L dc v2
-U 1 1 565DC066
-P 5550 3000
-F 0 "v2" H 5350 3100 60  0000 C CNN
-F 1 "dc" H 5350 2950 60  0000 C CNN
-F 2 "R1" H 5250 3000 60  0000 C CNN
-F 3 "" H 5550 3000 60  0000 C CNN
-	1    5550 3000
-	1    0    0    -1  
-$EndComp
-$Comp
-L aswitch U1
-U 1 1 565DC87E
-P 6400 2100
-F 0 "U1" H 6850 2400 60  0000 C CNN
-F 1 "aswitch" H 6850 2300 60  0000 C CNN
-F 2 "" H 6850 2200 60  0000 C CNN
-F 3 "" H 6850 2200 60  0000 C CNN
-	1    6400 2100
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	5950 2000 6650 2000
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/scr/scr.cir.ckt b/src/SubcircuitLibrary/scr/scr.cir.ckt
deleted file mode 100644
index b0e218fd..00000000
--- a/src/SubcircuitLibrary/scr/scr.cir.ckt
+++ /dev/null
@@ -1,19 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: 08/21/14 11:07:22

-.include diode.lib

-

-u2  5 8 1 port

-* f2

-* Analog Switch analogswitch

-d1  4 2 diode

-v2  3 4 dc 0

-c1  5 6 10u

-r2  5 6 1

-* f1

-v1  9 7 dc 0

-r1  8 9 50

-Vf2 2 5 0

-f2 5 6 Vf2 100

-Vf1 7 5 0

-f1 5 6 Vf1 10

-a1 6 (1 3) u1

-.model u1 aswitch(cntl_on=0.25 cntl_off=0.1 r_on=0.0125 r_off=1000000)

diff --git a/src/SubcircuitLibrary/scr/scr.cir.out~ b/src/SubcircuitLibrary/scr/scr.cir.out~
deleted file mode 100644
index d600f25d..00000000
--- a/src/SubcircuitLibrary/scr/scr.cir.out~
+++ /dev/null
@@ -1,29 +0,0 @@
-* /opt/esim/src/subcircuitlibrary/scr/scr.cir
-
-.include PowerDiode.lib
-* u2  3 7 1 port
-* f2
-d1 5 2 PowerDiode
-c1  3 9 10u
-* f1
-v1 8 4  dc 0
-v2 6 5  dc 0
-* u1  9 1 6 aswitch
-r1  7 8 50
-r2  3 9 1
-Vf2 2 3 0
-f2 3 9 Vf2 100
-Vf1 4 3 0
-f1 3 9 Vf1 10
-a1 9 (1 6)  u1
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.0 cntl_on=1.0 r_on=1.0 r_off=1.0e12 ) 
-.tran 0e-12 0e-00 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/scr/scr.sub~ b/src/SubcircuitLibrary/scr/scr.sub~
deleted file mode 100644
index 0fdddbf4..00000000
--- a/src/SubcircuitLibrary/scr/scr.sub~
+++ /dev/null
@@ -1,23 +0,0 @@
-* Subcircuit scr
-.subckt scr 3 7 1 
-* /opt/esim/src/subcircuitlibrary/scr/scr.cir
-.include PowerDiode.lib
-* f2
-d1 5 2 PowerDiode
-c1  3 9 10u
-* f1
-v1 8 4  dc 0
-v2 6 5  dc 0
-* u1  9 1 6 aswitch
-r1  7 8 50
-r2  3 9 1
-Vf2 2 3 0
-f2 3 9 Vf2 100
-Vf1 4 3 0
-f1 3 9 Vf1 10
-a1 9 [1 6 ] u1
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.0 cntl_on=1.0 r_on=1.0 r_off=1.0e12 )
-* Control Statements
-
-.ends scr
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/scr/userDiode.lib b/src/SubcircuitLibrary/scr/userDiode.lib
new file mode 100644
index 00000000..89b96f4a
--- /dev/null
+++ b/src/SubcircuitLibrary/scr/userDiode.lib
@@ -0,0 +1 @@
+.MODEL D1N750 D( Vj=.75 Nbvl=14.976 Cjo=175p Rs=.25 Isr=1.859n Eg=1.11 M=.5516 Nbv=1.6989 N=1 Tbv1=-21.277u Bv=8.1 Fc=.5 Ikf=0 Nr=2 Ibv=20.245m Is=880.5E-18 Xti=3 Ibvl=1.9556m )
diff --git a/src/SubcircuitLibrary/triac/.triac.s.swp b/src/SubcircuitLibrary/triac/.triac.s.swp
deleted file mode 100644
index 1a4c2d0e..00000000
--- a/src/SubcircuitLibrary/triac/.triac.s.swp
+++ /dev/null
diff --git a/src/SubcircuitLibrary/triac/.triac.sub.swp b/src/SubcircuitLibrary/triac/.triac.sub.swp
deleted file mode 100644
index 521ce758..00000000
--- a/src/SubcircuitLibrary/triac/.triac.sub.swp
+++ /dev/null
diff --git a/src/SubcircuitLibrary/triac/PowerDiode.lib b/src/SubcircuitLibrary/triac/PowerDiode.lib
index a2f61dce..d6fb6469 100644
--- a/src/SubcircuitLibrary/triac/PowerDiode.lib
+++ b/src/SubcircuitLibrary/triac/PowerDiode.lib
@@ -1,20 +1 @@
-.MODEL PowerDiode D(
-+ Vj=.75
-+ Nbvl=14.976
-+ Cjo=175p
-+ Rs=.25
-+ Isr=1.859n
-+ Eg=1.11
-+ M=.5516
-+ Nbv=1.6989
-+ N=1
-+ Tbv1=-21.277u
-+ bv=1800
-+ Fc=.5
-+ Ikf=0
-+ Nr=2
-+ Ibv=20.245m
-+ Is=2.2E-15
-+ Xti=3
-+ Ibvl=1.9556m
-)
\ No newline at end of file
+.MODEL PowerDiode D( Vj=.75 Nbvl=14.976 Cjo=175p Rs=.25 Isr=1.859n Eg=1.11 M=.5516 Nbv=1.6989 N=1 Tbv1=-21.277u bv=1800 Fc=.5 Ikf=0 Nr=2 Ibv=20.245m Is=2.2E-15 Xti=3 Ibvl=1.9556m )
diff --git a/src/SubcircuitLibrary/triac/triac.bak b/src/SubcircuitLibrary/triac/triac.bak
deleted file mode 100644
index f30533a0..00000000
--- a/src/SubcircuitLibrary/triac/triac.bak
+++ /dev/null
@@ -1,308 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-LIBS:eSim_Hybrid
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Sources
-LIBS:eSim_Subckt
-LIBS:eSim_User
-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:triac-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date "22 sep 2014"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L PORT U3
-U 3 1 541D1606
-P 1250 1750
-F 0 "U3" H 1250 1700 30  0000 C CNN
-F 1 "PORT" H 1250 1750 30  0000 C CNN
-F 2 "" H 1250 1750 60  0001 C CNN
-F 3 "" H 1250 1750 60  0001 C CNN
-	3    1250 1750
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U3
-U 2 1 541D1601
-P 1300 900
-F 0 "U3" H 1300 850 30  0000 C CNN
-F 1 "PORT" H 1300 900 30  0000 C CNN
-F 2 "" H 1300 900 60  0001 C CNN
-F 3 "" H 1300 900 60  0001 C CNN
-	2    1300 900 
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U3
-U 1 1 541D15F6
-P 1150 4050
-F 0 "U3" H 1150 4000 30  0000 C CNN
-F 1 "PORT" H 1150 4050 30  0000 C CNN
-F 2 "" H 1150 4050 60  0001 C CNN
-F 3 "" H 1150 4050 60  0001 C CNN
-	1    1150 4050
-	1    0    0    -1  
-$EndComp
-$Comp
-L CCCS F3
-U 1 1 541D1417
-P 6250 3100
-F 0 "F3" H 6050 3200 50  0000 C CNN
-F 1 "10" H 6050 3050 50  0000 C CNN
-F 2 "" H 6250 3100 60  0001 C CNN
-F 3 "" H 6250 3100 60  0001 C CNN
-	1    6250 3100
-	0    1    1    0   
-$EndComp
-$Comp
-L DC v3
-U 1 1 541D13FB
-P 6050 1950
-F 0 "v3" H 5850 2050 60  0000 C CNN
-F 1 "DC" H 5850 1900 60  0000 C CNN
-F 2 "R1" H 5750 1950 60  0000 C CNN
-F 3 "" H 6050 1950 60  0001 C CNN
-	1    6050 1950
-	-1   0    0    1   
-$EndComp
-$Comp
-L CCCS F2
-U 1 1 541D13A3
-P 3900 2550
-F 0 "F2" H 3700 2650 50  0000 C CNN
-F 1 "10" H 3700 2500 50  0000 C CNN
-F 2 "" H 3900 2550 60  0001 C CNN
-F 3 "" H 3900 2550 60  0001 C CNN
-	1    3900 2550
-	0    1    1    0   
-$EndComp
-$Comp
-L DC v2
-U 1 1 541D1398
-P 3700 1850
-F 0 "v2" H 3500 1950 60  0000 C CNN
-F 1 "DC" H 3500 1800 60  0000 C CNN
-F 2 "R1" H 3400 1850 60  0000 C CNN
-F 3 "" H 3700 1850 60  0001 C CNN
-	1    3700 1850
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C1
-U 1 1 541D137C
-P 3300 4350
-F 0 "C1" H 3350 4450 50  0000 L CNN
-F 1 "10u" H 3350 4250 50  0000 L CNN
-F 2 "" H 3300 4350 60  0001 C CNN
-F 3 "" H 3300 4350 60  0001 C CNN
-	1    3300 4350
-	1    0    0    -1  
-$EndComp
-$Comp
-L CCCS F1
-U 1 1 541D1363
-P 2100 3600
-F 0 "F1" H 1900 3700 50  0000 C CNN
-F 1 "100" H 1900 3550 50  0000 C CNN
-F 2 "" H 2100 3600 60  0001 C CNN
-F 3 "" H 2100 3600 60  0001 C CNN
-	1    2100 3600
-	0    1    1    0   
-$EndComp
-$Comp
-L DC v1
-U 1 1 541D1357
-P 1900 2900
-F 0 "v1" H 1700 3000 60  0000 C CNN
-F 1 "DC" H 1700 2850 60  0000 C CNN
-F 2 "R1" H 1600 2900 60  0000 C CNN
-F 3 "" H 1900 2900 60  0001 C CNN
-	1    1900 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L aswitch U1
-U 1 1 56669B8A
-P 4600 1100
-F 0 "U1" H 5050 1400 60  0000 C CNN
-F 1 "aswitch" H 5050 1300 60  0000 C CNN
-F 2 "" H 5050 1200 60  0000 C CNN
-F 3 "" H 5050 1200 60  0000 C CNN
-	1    4600 1100
-	-1   0    0    1   
-$EndComp
-$Comp
-L aswitch U2
-U 1 1 56669DB5
-P 6400 1350
-F 0 "U2" H 6850 1650 60  0000 C CNN
-F 1 "aswitch" H 6850 1550 60  0000 C CNN
-F 2 "" H 6850 1450 60  0000 C CNN
-F 3 "" H 6850 1450 60  0000 C CNN
-	1    6400 1350
-	1    0    0    -1  
-$EndComp
-Connection ~ 4600 900 
-Wire Wire Line
-	4600 1250 4600 900 
-Wire Wire Line
-	1900 1750 1500 1750
-Connection ~ 6300 4900
-Wire Wire Line
-	6300 3400 6300 4900
-Connection ~ 3950 4900
-Wire Wire Line
-	3950 2850 3950 4900
-Connection ~ 2700 4050
-Wire Wire Line
-	2700 3300 2700 4050
-Wire Wire Line
-	2150 3300 2700 3300
-Connection ~ 3300 4900
-Wire Wire Line
-	7450 4900 7450 700 
-Connection ~ 3700 4050
-Wire Wire Line
-	6050 4050 6050 3150
-Wire Wire Line
-	6050 2400 6050 2500
-Wire Wire Line
-	3700 1250 3750 1250
-Wire Wire Line
-	3700 1400 3700 1250
-Wire Wire Line
-	3700 2850 3700 2600
-Connection ~ 2750 4050
-Wire Wire Line
-	2750 4050 2750 4150
-Wire Wire Line
-	1900 3350 1900 3550
-Wire Wire Line
-	1900 2450 1900 1750
-Wire Wire Line
-	1900 4050 1900 3650
-Wire Wire Line
-	3300 4050 3300 4200
-Wire Wire Line
-	3700 3150 3700 4050
-Connection ~ 3300 4050
-Wire Wire Line
-	3700 2500 3700 2300
-Wire Wire Line
-	6050 1200 6050 1500
-Wire Wire Line
-	6400 1200 6050 1200
-Wire Wire Line
-	6050 2800 6050 3050
-Wire Wire Line
-	2750 4450 2750 4900
-Wire Wire Line
-	3300 4500 3300 4900
-Connection ~ 7450 1400
-Wire Wire Line
-	2150 4900 2150 3900
-Wire Wire Line
-	2150 4900 7450 4900
-Connection ~ 2750 4900
-Wire Wire Line
-	4450 2250 3950 2250
-Wire Wire Line
-	4450 4050 4450 2250
-Connection ~ 4450 4050
-Wire Wire Line
-	6650 2800 6300 2800
-Wire Wire Line
-	6650 4050 6650 2800
-Connection ~ 6050 4050
-Wire Wire Line
-	1550 900  7250 900 
-Wire Wire Line
-	1400 4050 6650 4050
-Connection ~ 1900 4050
-Wire Wire Line
-	7450 700  4150 700 
-Wire Wire Line
-	4150 700  4150 1000
-Wire Wire Line
-	6850 1450 7350 1450
-Wire Wire Line
-	7350 1450 7350 1400
-Wire Wire Line
-	7350 1400 7450 1400
-Wire Wire Line
-	7250 900  7250 1200
-$Comp
-L R R1
-U 1 1 5666A886
-P 2700 4250
-F 0 "R1" H 2750 4380 50  0000 C CNN
-F 1 "1" H 2750 4300 50  0000 C CNN
-F 2 "" H 2750 4230 30  0000 C CNN
-F 3 "" V 2750 4300 30  0000 C CNN
-	1    2700 4250
-	0    1    1    0   
-$EndComp
-$Comp
-L D D1
-U 1 1 5666A9A7
-P 3700 3000
-F 0 "D1" H 3700 3100 50  0000 C CNN
-F 1 "D" H 3700 2900 50  0000 C CNN
-F 2 "" H 3700 3000 60  0000 C CNN
-F 3 "" H 3700 3000 60  0000 C CNN
-	1    3700 3000
-	0    1    1    0   
-$EndComp
-$Comp
-L D D2
-U 1 1 5666A9E4
-P 6050 2650
-F 0 "D2" H 6050 2750 50  0000 C CNN
-F 1 "D" H 6050 2550 50  0000 C CNN
-F 2 "" H 6050 2650 60  0000 C CNN
-F 3 "" H 6050 2650 60  0000 C CNN
-	1    6050 2650
-	0    -1   -1   0   
-$EndComp
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/triac/triac.cir.ckt b/src/SubcircuitLibrary/triac/triac.cir.ckt
deleted file mode 100644
index 821b417b..00000000
--- a/src/SubcircuitLibrary/triac/triac.cir.ckt
+++ /dev/null
@@ -1,26 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: 09/20/14 11:23:24

-.include diode.lib

-

-u3  7 4 5 port

-* f3

-d2  3 2 diode

-v3  2 1 dc 0

-* Analog Switch analogswitch

-d1  11 7 diode

-* f2

-v2  8 10 dc 0

-* Analog Switch analogswitch

-c1  7 9 10u

-r1  7 9 1

-* f1

-v1  5 6 dc 0

-Vf3 3 7 0

-f3 7 9 Vf3 10

-Vf2 10 11 0

-f2 7 9 Vf2 10

-Vf1 6 7 0

-f1 7 9 Vf1 100

-a1 9 (1 4) u2

-.model u2 aswitch(cntl_on=-1 cntl_off=-0.1 r_on=0.0125 r_off=1000000)

-a2 9 (4 8) u1

-.model u1 aswitch(cntl_on=1 cntl_off=0.1 r_on=0.0125 r_off=1000000)

diff --git a/src/SubcircuitLibrary/triac/triac.cir.out~ b/src/SubcircuitLibrary/triac/triac.cir.out~
deleted file mode 100644
index 7bd15a7b..00000000
--- a/src/SubcircuitLibrary/triac/triac.cir.out~
+++ /dev/null
@@ -1,41 +0,0 @@
-* /opt/esim/src/subcircuitlibrary/triac/triac.cir
-
-.include PowerDiode.lib
-* u3  8 11 10 port
-* f3
-v3 7 2  dc 0
-* f2
-v2 6 3  dc 0
-c1  8 9 10u
-* f1
-v1 10 4  dc 0
-* u1  9 11 6 aswitch
-* u2  9 2 11 aswitch
-r1  8 9 1
-d1 5 8 PowerDiode
-d2 1 7 PowerDiode
-Vf3 1 8 0
-f3 8 9 Vf3 10
-Vf2 3 5 0
-f2 8 9 Vf2 10
-Vf1 4 8 0
-f1 8 9 Vf1 100
-a1 9 [11 6 ] u1
-a2 9 [2 11 ] u2
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=1 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-1 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=1 r_on=0.0125 r_off=1000000 ) 
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-1 r_on=0.0125 r_off=1000000 ) 
-.tran 0e-00 0e-00 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/triac/triac.sub~ b/src/SubcircuitLibrary/triac/triac.sub~
deleted file mode 100644
index ebbed05e..00000000
--- a/src/SubcircuitLibrary/triac/triac.sub~
+++ /dev/null
@@ -1,35 +0,0 @@
-* Subcircuit triac
-.subckt triac 8 11 10 
-* /opt/esim/src/subcircuitlibrary/triac/triac.cir
-.include PowerDiode.lib
-* f3
-v3 7 2  dc 0
-* f2
-v2 6 3  dc 0
-c1  8 9 10u
-* f1
-v1 10 4  dc 0
-* u1  9 11 6 aswitch
-* u2  9 2 11 aswitch
-r1  8 9 1
-d1 5 8 PowerDiode
-d2 1 7 PowerDiode
-Vf3 1 8 0
-f3 8 9 Vf3 10
-Vf2 3 5 0
-f2 8 9 Vf2 10
-Vf1 4 8 0
-f1 8 9 Vf1 100
-a1 9 [11 6 ] u1
-a2 9 [2 11 ] u2
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=1 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-1 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=1 r_on=0.0125 r_off=1000000 )
-* Schematic Name: aswitch, NgSpice Name: aswitch
-.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-1 r_on=0.0125 r_off=1000000 )
-* Control Statements
-
-.ends triac
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/ua741/ua741-cache.bak b/src/SubcircuitLibrary/ua741/ua741-cache.bak
deleted file mode 100644
index eaad34ad..00000000
--- a/src/SubcircuitLibrary/ua741/ua741-cache.bak
+++ /dev/null
@@ -1,100 +0,0 @@
-EESchema-LIBRARY Version 2.3  Date: Sunday 21 October 2012 01:22:10 AM IST
-#encoding utf-8
-#
-# C
-#
-DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
-$FPLIST
- SM*
- C?
- C1-1
-$ENDFPLIST
-DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
-X ~ 1 0 200 170 D 40 40 1 1 P
-X ~ 2 0 -200 170 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF ~GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 0 30 H I C CNN
-F1 "GND" 0 -70 30 H I C CNN
-DRAW
-P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
-X GND 1 0 0 0 U 30 30 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 F N
-F0 "U" 0 -50 30 H V C CNN
-F1 "PORT" 0 0 30 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 I
-X ~ 2 250 0 100 L 30 30 2 1 I
-X ~ 3 250 0 100 L 30 30 3 1 I
-X ~ 4 250 0 100 L 30 30 4 1 I
-X ~ 5 250 0 100 L 30 30 5 1 I
-X ~ 6 250 0 100 L 30 30 6 1 I
-X ~ 7 250 0 100 L 30 30 7 1 I
-X ~ 8 250 0 100 L 30 30 8 1 I
-ENDDRAW
-ENDDEF
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
-DRAW
-X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-$FPLIST
- R?
- SM0603
- SM0805
- R?-*
-$ENDFPLIST
-DRAW
-S -40 150 40 -150 0 1 12 N
-X ~ 1 0 250 100 D 60 60 1 1 P
-X ~ 2 0 -250 100 U 60 60 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VCVS
-#
-DEF VCVS E 0 40 Y Y 1 F N
-F0 "E" -200 100 50 H V C CNN
-F1 "VCVS" -200 -50 50 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
-#
-#End Library
diff --git a/src/SubcircuitLibrary/ua741/ua741.bak b/src/SubcircuitLibrary/ua741/ua741.bak
deleted file mode 100644
index 6be92803..00000000
--- a/src/SubcircuitLibrary/ua741/ua741.bak
+++ /dev/null
@@ -1,208 +0,0 @@
-EESchema Schematic File Version 2  date Monday 17 December 2012 11:17:01 AM IST
-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:ua741-cache
-EELAYER 25  0
-EELAYER END
-$Descr A4 11700 8267
-encoding utf-8
-Sheet 1 1
-Title ""
-Date "20 oct 2012"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L PORT U1
-U 3 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
-	3    6250 2500
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 1 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
-	1    2300 3100
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 2 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
-	2    2250 2600
-	1    0    0    -1  
-$EndComp
-Connection ~ 3700 3200
-Wire Wire Line
-	3450 3200 3700 3200
-Connection ~ 5000 3300
-Wire Wire Line
-	3700 3300 5250 3300
-Wire Wire Line
-	5250 3300 5250 3200
-Connection ~ 4550 3300
-Wire Wire Line
-	5000 3300 5000 2950
-Connection ~ 3700 3300
-Wire Wire Line
-	4550 3300 4550 3100
-Wire Wire Line
-	3900 2500 3700 2500
-Wire Wire Line
-	3700 2500 3700 2550
-Wire Wire Line
-	3450 2900 3300 2900
-Wire Wire Line
-	3300 2900 3300 3200
-Wire Wire Line
-	3300 3200 2950 3200
-Connection ~ 2950 3100
-Wire Wire Line
-	2950 3200 2950 3100
-Wire Wire Line
-	3000 2600 2500 2600
-Wire Wire Line
-	2550 3100 3000 3100
-Wire Wire Line
-	2950 2600 2950 2500
-Connection ~ 2950 2600
-Wire Wire Line
-	2950 2500 3300 2500
-Wire Wire Line
-	3300 2500 3300 2800
-Wire Wire Line
-	3300 2800 3450 2800
-Wire Wire Line
-	3700 3150 3700 3400
-Wire Wire Line
-	4550 2500 4550 2700
-Wire Wire Line
-	4400 2500 5000 2500
-Wire Wire Line
-	5000 2500 5000 2850
-Connection ~ 4550 2500
-Wire Wire Line
-	5250 2600 5250 2500
-Wire Wire Line
-	5250 2500 5350 2500
-Wire Wire Line
-	5850 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
-	0    1    1    0   
-$EndComp
-$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
-	1    0    0    -1  
-$EndComp
-$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
-	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
-	1    0    0    -1  
-$EndComp
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/ua741/ua741.cir.ckt b/src/SubcircuitLibrary/ua741/ua741.cir.ckt
deleted file mode 100644
index 3661a9a2..00000000
--- a/src/SubcircuitLibrary/ua741/ua741.cir.ckt
+++ /dev/null
@@ -1,9 +0,0 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:16:58 am ist
-
-u1  6 7 3 port
-rout1  3 2 75
-eout1  2 0 1 0 1
-cbw1  1 0 31.85e-9
-rbw1  1 4 0.5e6
-ein1  4 0 7 6 100e3
-rin1  7 6 2e6
diff --git a/src/SubcircuitLibrary/ua741/ua741.pro b/src/SubcircuitLibrary/ua741/ua741.pro
index 5dbb81a5..be9bc92c 100644
--- a/src/SubcircuitLibrary/ua741/ua741.pro
+++ b/src/SubcircuitLibrary/ua741/ua741.pro
@@ -2,7 +2,7 @@ update=Monday 17 December 2012 06:14:06 PM IST
 last_client=eeschema
 [eeschema]
 version=1
-LibDir=/home/yogesh/FreeEDA/library
+LibDir=
 NetFmt=1
 HPGLSpd=20
 HPGLDm=15