diff --git a/analog-moist-sensor.net b/analog-moist-sensor.net
index f3708ee..e4c920b 100644
--- a/analog-moist-sensor.net
+++ b/analog-moist-sensor.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/miceuz/Xaltura/analog-moist-sensor/analog-moist-sensor.sch)
-    (date "Thu 26 Mar 2015 02:21:08 PM EET")
+    (date "Thu 26 Mar 2015 02:47:32 PM EET")
     (tool "Eeschema (2015-03-21 BZR 5528)-product")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -29,25 +29,25 @@
       (tstamp 54D21739))
     (comp (ref C1)
       (value 18p)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D21881))
     (comp (ref C2)
       (value 18p)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D218DE))
     (comp (ref R1)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2193D))
     (comp (ref C3)
       (value 1u)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D21E5C))
@@ -65,43 +65,43 @@
       (tstamp 54D22068))
     (comp (ref R4)
       (value 330)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2209D))
     (comp (ref R5)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D22174))
     (comp (ref R8)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D221C8))
     (comp (ref C4)
       (value 1n)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2222A))
     (comp (ref R7)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D222F8))
     (comp (ref C5)
       (value 1n)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D22484))
     (comp (ref R6)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2252C))
@@ -119,67 +119,67 @@
       (tstamp 54D22CB3))
     (comp (ref R3)
       (value 1M)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D22EA4))
     (comp (ref C6)
       (value 1u)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2428C))
     (comp (ref U2)
       (value LM324)
-      (footprint SMD_Packages:SOIC-14_W)
+      (footprint Housings_SSOP:TSSOP-14_4.4x5mm_Pitch0.65mm)
       (libsource (lib linear) (part LM324))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2AB47))
     (comp (ref R9)
       (value "10k 0.1%")
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2B12F))
     (comp (ref R10)
       (value "10k 0.1%")
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2B156))
     (comp (ref R11)
       (value "10k 0.1%")
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2B17D))
     (comp (ref R12)
       (value "10k 0.1%")
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 54D2B42B))
     (comp (ref R13)
       (value 330)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 551426A3))
     (comp (ref R2)
       (value 10k)
-      (footprint SMD_Packages:SMD-0603_r)
+      (footprint Resistors_SMD:R_0603)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 5514275D))
     (comp (ref C7)
       (value 1u)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 551427DB))
     (comp (ref C8)
       (value 1u)
-      (footprint SMD_Packages:SMD-0603_c)
+      (footprint Capacitors_SMD:C_0603)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 551434BC)))
@@ -302,99 +302,98 @@
     (library (logical device)
       (uri /usr/local/share/kicad/library/device.lib)))
   (nets
-    (net (code 1) (name "Net-(C2-Pad1)")
-      (node (ref C2) (pin 1))
-      (node (ref X1) (pin 2)))
-    (net (code 2) (name GND)
-      (node (ref C1) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref C6) (pin 2))
-      (node (ref R8) (pin 1))
-      (node (ref C3) (pin 2))
-      (node (ref C4) (pin 2))
-      (node (ref R7) (pin 1))
-      (node (ref C8) (pin 2))
-      (node (ref C5) (pin 2))
+    (net (code 1) (name GND)
       (node (ref U1) (pin 2))
-      (node (ref R11) (pin 2))
-      (node (ref P1) (pin 1))
-      (node (ref P1) (pin 3))
+      (node (ref C5) (pin 2))
+      (node (ref R7) (pin 1))
+      (node (ref C4) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref R8) (pin 1))
+      (node (ref C8) (pin 2))
+      (node (ref C7) (pin 2))
       (node (ref P1) (pin 4))
-      (node (ref U2) (pin 11)))
-    (net (code 3) (name /SENSOR_TRACK)
+      (node (ref P1) (pin 3))
+      (node (ref P1) (pin 1))
+      (node (ref C6) (pin 2))
+      (node (ref C2) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref U2) (pin 11))
+      (node (ref R11) (pin 2)))
+    (net (code 2) (name /SENSOR_TRACK)
       (node (ref D1) (pin 2))
       (node (ref D2) (pin 1))
       (node (ref R4) (pin 1)))
-    (net (code 4) (name "Net-(R13-Pad2)")
-      (node (ref U2) (pin 1))
+    (net (code 3) (name "Net-(R13-Pad2)")
       (node (ref U2) (pin 2))
-      (node (ref R13) (pin 2)))
-    (net (code 5) (name "Net-(R12-Pad2)")
+      (node (ref R13) (pin 2))
+      (node (ref U2) (pin 1)))
+    (net (code 4) (name "Net-(R12-Pad2)")
       (node (ref R9) (pin 1))
       (node (ref R12) (pin 2))
       (node (ref U2) (pin 13)))
+    (net (code 5) (name "Net-(R10-Pad1)")
+      (node (ref R11) (pin 1))
+      (node (ref U2) (pin 12))
+      (node (ref R10) (pin 1)))
     (net (code 6) (name "Net-(R10-Pad2)")
       (node (ref R10) (pin 2))
-      (node (ref U2) (pin 6))
-      (node (ref U2) (pin 7)))
-    (net (code 7) (name "Net-(R10-Pad1)")
-      (node (ref U2) (pin 12))
-      (node (ref R11) (pin 1))
-      (node (ref R10) (pin 1)))
-    (net (code 8) (name VDD)
-      (node (ref R3) (pin 1))
+      (node (ref U2) (pin 7))
+      (node (ref U2) (pin 6)))
+    (net (code 7) (name VDD)
+      (node (ref P1) (pin 6))
       (node (ref Q1) (pin D))
-      (node (ref P1) (pin 6)))
-    (net (code 9) (name /OUT)
+      (node (ref R3) (pin 1)))
+    (net (code 8) (name /OUT)
       (node (ref R13) (pin 1))
       (node (ref C8) (pin 1))
       (node (ref P1) (pin 2)))
-    (net (code 10) (name "Net-(C7-Pad1)")
-      (node (ref R2) (pin 1))
+    (net (code 9) (name "Net-(C7-Pad1)")
+      (node (ref C7) (pin 1))
       (node (ref U2) (pin 3))
-      (node (ref C7) (pin 1)))
-    (net (code 11) (name "Net-(R12-Pad1)")
-      (node (ref U2) (pin 14))
+      (node (ref R2) (pin 1)))
+    (net (code 10) (name "Net-(R12-Pad1)")
       (node (ref R2) (pin 2))
+      (node (ref U2) (pin 14))
       (node (ref R12) (pin 1)))
-    (net (code 12) (name "Net-(R9-Pad2)")
-      (node (ref U2) (pin 8))
+    (net (code 11) (name "Net-(R9-Pad2)")
       (node (ref U2) (pin 9))
-      (node (ref R9) (pin 2)))
-    (net (code 13) (name /~ENABLE)
-      (node (ref R3) (pin 2))
+      (node (ref R9) (pin 2))
+      (node (ref U2) (pin 8)))
+    (net (code 12) (name /~ENABLE)
+      (node (ref P1) (pin 5))
       (node (ref Q1) (pin G))
-      (node (ref P1) (pin 5)))
-    (net (code 15) (name "Net-(R4-Pad2)")
-      (node (ref U1) (pin 4))
-      (node (ref R4) (pin 2)))
-    (net (code 16) (name VCC)
-      (node (ref U2) (pin 4))
+      (node (ref R3) (pin 2)))
+    (net (code 14) (name "Net-(R4-Pad2)")
+      (node (ref R4) (pin 2))
+      (node (ref U1) (pin 4)))
+    (net (code 15) (name VCC)
       (node (ref C6) (pin 1))
+      (node (ref U2) (pin 4))
+      (node (ref C3) (pin 1))
       (node (ref R6) (pin 2))
       (node (ref Q1) (pin S))
-      (node (ref C3) (pin 1))
-      (node (ref R5) (pin 2))
-      (node (ref U1) (pin 5)))
-    (net (code 17) (name /SENSE_LOW)
-      (node (ref R7) (pin 2))
-      (node (ref C4) (pin 1))
+      (node (ref U1) (pin 5))
+      (node (ref R5) (pin 2)))
+    (net (code 16) (name /SENSE_LOW)
       (node (ref R5) (pin 1))
       (node (ref U2) (pin 10))
-      (node (ref D1) (pin 1)))
-    (net (code 18) (name "Net-(C1-Pad1)")
+      (node (ref D1) (pin 1))
+      (node (ref R7) (pin 2))
+      (node (ref C4) (pin 1)))
+    (net (code 17) (name "Net-(C1-Pad1)")
       (node (ref X1) (pin 1))
       (node (ref U1) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref R1) (pin 2)))
-    (net (code 19) (name "Net-(R1-Pad1)")
-      (node (ref U1) (pin 3))
+      (node (ref R1) (pin 2))
+      (node (ref C1) (pin 1)))
+    (net (code 18) (name "Net-(C2-Pad1)")
       (node (ref U1) (pin 6))
-      (node (ref R1) (pin 1)))
-    (net (code 23) (name /SENSE_HIGH)
+      (node (ref R1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref X1) (pin 2))
+      (node (ref U1) (pin 3)))
+    (net (code 22) (name /SENSE_HIGH)
       (node (ref C5) (pin 1))
-      (node (ref R8) (pin 2))
-      (node (ref U2) (pin 5))
       (node (ref R6) (pin 1))
-      (node (ref D2) (pin 2)))))
\ No newline at end of file
+      (node (ref D2) (pin 2))
+      (node (ref U2) (pin 5))
+      (node (ref R8) (pin 2)))))
\ No newline at end of file
diff --git a/analog-moist-sensor.sch b/analog-moist-sensor.sch
index a702e1d..3277302 100644
--- a/analog-moist-sensor.sch
+++ b/analog-moist-sensor.sch
@@ -78,10 +78,10 @@ F 3 "" H 4550 2950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR01
 U 1 1 54D2181C
 P 3600 3200
-F 0 "#PWR4" H 3600 2950 60  0001 C CNN
+F 0 "#PWR01" H 3600 2950 60  0001 C CNN
 F 1 "GND" H 3600 3050 60  0000 C CNN
 F 2 "" H 3600 3200 60  0000 C CNN
 F 3 "" H 3600 3200 60  0000 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 3600 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR3
+L VCC #PWR02
 U 1 1 54D2185B
 P 3600 2700
-F 0 "#PWR3" H 3600 2550 60  0001 C CNN
+F 0 "#PWR02" H 3600 2550 60  0001 C CNN
 F 1 "VCC" H 3600 2850 60  0000 C CNN
 F 2 "" H 3600 2700 60  0000 C CNN
 F 3 "" H 3600 2700 60  0000 C CNN
@@ -105,7 +105,7 @@ U 1 1 54D21881
 P 3350 3850
 F 0 "C1" H 3400 3950 50  0000 L CNN
 F 1 "18p" H 3400 3750 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 3388 3700 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 3388 3700 30  0001 C CNN
 F 3 "" H 3350 3850 60  0000 C CNN
 	1    3350 3850
 	1    0    0    -1  
@@ -116,7 +116,7 @@ U 1 1 54D218DE
 P 3950 3850
 F 0 "C2" H 4000 3950 50  0000 L CNN
 F 1 "18p" H 4000 3750 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 3988 3700 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 3988 3700 30  0001 C CNN
 F 3 "" H 3950 3850 60  0000 C CNN
 	1    3950 3850
 	1    0    0    -1  
@@ -127,16 +127,16 @@ U 1 1 54D2193D
 P 3600 2250
 F 0 "R1" V 3680 2250 50  0000 C CNN
 F 1 "1M" V 3607 2251 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 3530 2250 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 3530 2250 30  0001 C CNN
 F 3 "" H 3600 2250 30  0000 C CNN
 	1    3600 2250
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR03
 U 1 1 54D21A04
 P 3650 4050
-F 0 "#PWR5" H 3650 3800 60  0001 C CNN
+F 0 "#PWR03" H 3650 3800 60  0001 C CNN
 F 1 "GND" H 3650 3900 60  0000 C CNN
 F 2 "" H 3650 4050 60  0000 C CNN
 F 3 "" H 3650 4050 60  0000 C CNN
@@ -144,10 +144,10 @@ F 3 "" H 3650 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR6
+L VCC #PWR04
 U 1 1 54D21DD5
 P 4500 2200
-F 0 "#PWR6" H 4500 2050 60  0001 C CNN
+F 0 "#PWR04" H 4500 2050 60  0001 C CNN
 F 1 "VCC" H 4500 2350 60  0000 C CNN
 F 2 "" H 4500 2200 60  0000 C CNN
 F 3 "" H 4500 2200 60  0000 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 4500 2200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR05
 U 1 1 54D21DE7
 P 4500 3200
-F 0 "#PWR7" H 4500 2950 60  0001 C CNN
+F 0 "#PWR05" H 4500 2950 60  0001 C CNN
 F 1 "GND" H 4500 3050 60  0000 C CNN
 F 2 "" H 4500 3200 60  0000 C CNN
 F 3 "" H 4500 3200 60  0000 C CNN
@@ -171,16 +171,16 @@ U 1 1 54D21E5C
 P 4750 2350
 F 0 "C3" H 4800 2450 50  0000 L CNN
 F 1 "1u" H 4800 2250 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 4788 2200 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 4788 2200 30  0001 C CNN
 F 3 "" H 4750 2350 60  0000 C CNN
 	1    4750 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR06
 U 1 1 54D21F25
 P 4750 2500
-F 0 "#PWR9" H 4750 2250 60  0001 C CNN
+F 0 "#PWR06" H 4750 2250 60  0001 C CNN
 F 1 "GND" H 4750 2350 60  0000 C CNN
 F 2 "" H 4750 2500 60  0000 C CNN
 F 3 "" H 4750 2500 60  0000 C CNN
@@ -215,16 +215,16 @@ U 1 1 54D2209D
 P 5150 2950
 F 0 "R4" V 5230 2950 50  0000 C CNN
 F 1 "330" V 5157 2951 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 5080 2950 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5080 2950 30  0001 C CNN
 F 3 "" H 5150 2950 30  0000 C CNN
 	1    5150 2950
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR12
+L VCC #PWR07
 U 1 1 54D2215E
 P 6300 1950
-F 0 "#PWR12" H 6300 1800 60  0001 C CNN
+F 0 "#PWR07" H 6300 1800 60  0001 C CNN
 F 1 "VCC" H 6300 2100 60  0000 C CNN
 F 2 "" H 6300 1950 60  0000 C CNN
 F 3 "" H 6300 1950 60  0000 C CNN
@@ -237,7 +237,7 @@ U 1 1 54D22174
 P 6300 2100
 F 0 "R5" V 6380 2100 50  0000 C CNN
 F 1 "1M" V 6307 2101 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 6230 2100 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 6230 2100 30  0001 C CNN
 F 3 "" H 6300 2100 30  0000 C CNN
 	1    6300 2100
 	-1   0    0    1   
@@ -248,16 +248,16 @@ U 1 1 54D221C8
 P 6600 3850
 F 0 "R8" V 6680 3850 50  0000 C CNN
 F 1 "1M" V 6607 3851 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 6530 3850 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 6530 3850 30  0001 C CNN
 F 3 "" H 6600 3850 30  0000 C CNN
 	1    6600 3850
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR08
 U 1 1 54D2221D
 P 6300 4100
-F 0 "#PWR15" H 6300 3850 60  0001 C CNN
+F 0 "#PWR08" H 6300 3850 60  0001 C CNN
 F 1 "GND" H 6300 3950 60  0000 C CNN
 F 2 "" H 6300 4100 60  0000 C CNN
 F 3 "" H 6300 4100 60  0000 C CNN
@@ -270,16 +270,16 @@ U 1 1 54D2222A
 P 6300 2550
 F 0 "C4" H 6350 2650 50  0000 L CNN
 F 1 "1n" H 6350 2450 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 6338 2400 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 6338 2400 30  0001 C CNN
 F 3 "" H 6300 2550 60  0000 C CNN
 	1    6300 2550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR13
+L GND #PWR09
 U 1 1 54D222DF
 P 6300 2700
-F 0 "#PWR13" H 6300 2450 60  0001 C CNN
+F 0 "#PWR09" H 6300 2450 60  0001 C CNN
 F 1 "GND" H 6300 2550 60  0000 C CNN
 F 2 "" H 6300 2700 60  0000 C CNN
 F 3 "" H 6300 2700 60  0000 C CNN
@@ -292,7 +292,7 @@ U 1 1 54D222F8
 P 6600 2400
 F 0 "R7" V 6680 2400 50  0000 C CNN
 F 1 "1M" V 6607 2401 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 6530 2400 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 6530 2400 30  0001 C CNN
 F 3 "" H 6600 2400 30  0000 C CNN
 	1    6600 2400
 	-1   0    0    1   
@@ -305,7 +305,7 @@ U 1 1 54D22484
 P 6300 3950
 F 0 "C5" H 6350 4050 50  0000 L CNN
 F 1 "1n" H 6350 3850 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 6338 3800 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 6338 3800 30  0001 C CNN
 F 3 "" H 6300 3950 60  0000 C CNN
 	1    6300 3950
 	1    0    0    -1  
@@ -316,16 +316,16 @@ U 1 1 54D2252C
 P 6300 3450
 F 0 "R6" V 6380 3450 50  0000 C CNN
 F 1 "1M" V 6307 3451 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 6230 3450 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 6230 3450 30  0001 C CNN
 F 3 "" H 6300 3450 30  0000 C CNN
 	1    6300 3450
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR14
+L VCC #PWR010
 U 1 1 54D226D9
 P 6300 3300
-F 0 "#PWR14" H 6300 3150 60  0001 C CNN
+F 0 "#PWR010" H 6300 3150 60  0001 C CNN
 F 1 "VCC" H 6300 3450 60  0000 C CNN
 F 2 "" H 6300 3300 60  0000 C CNN
 F 3 "" H 6300 3300 60  0000 C CNN
@@ -359,10 +359,10 @@ F 3 "" H 5100 4900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VDD #PWR10
+L VDD #PWR011
 U 1 1 54D22D75
 P 4900 4800
-F 0 "#PWR10" H 4900 4650 60  0001 C CNN
+F 0 "#PWR011" H 4900 4650 60  0001 C CNN
 F 1 "VDD" H 4900 4950 60  0000 C CNN
 F 2 "" H 4900 4800 60  0000 C CNN
 F 3 "" H 4900 4800 60  0000 C CNN
@@ -370,10 +370,10 @@ F 3 "" H 4900 4800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR11
+L VCC #PWR012
 U 1 1 54D22E14
 P 5300 4800
-F 0 "#PWR11" H 5300 4650 60  0001 C CNN
+F 0 "#PWR012" H 5300 4650 60  0001 C CNN
 F 1 "VCC" H 5300 4950 60  0000 C CNN
 F 2 "" H 5300 4800 60  0000 C CNN
 F 3 "" H 5300 4800 60  0000 C CNN
@@ -386,16 +386,16 @@ U 1 1 54D22EA4
 P 4850 5100
 F 0 "R3" V 4930 5100 50  0000 C CNN
 F 1 "1M" V 4857 5101 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 4780 5100 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 4780 5100 30  0001 C CNN
 F 3 "" H 4850 5100 30  0000 C CNN
 	1    4850 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR013
 U 1 1 54D22F14
 P 3500 5550
-F 0 "#PWR2" H 3500 5300 60  0001 C CNN
+F 0 "#PWR013" H 3500 5300 60  0001 C CNN
 F 1 "GND" H 3500 5400 60  0000 C CNN
 F 2 "" H 3500 5550 60  0000 C CNN
 F 3 "" H 3500 5550 60  0000 C CNN
@@ -405,10 +405,10 @@ $EndComp
 Text Label 4700 5350 0    60   ~ 0
 ~ENABLE
 $Comp
-L VDD #PWR1
+L VDD #PWR014
 U 1 1 54D23198
 P 3500 4900
-F 0 "#PWR1" H 3500 4750 60  0001 C CNN
+F 0 "#PWR014" H 3500 4750 60  0001 C CNN
 F 1 "VDD" H 3500 5050 60  0000 C CNN
 F 2 "" H 3500 4900 60  0000 C CNN
 F 3 "" H 3500 4900 60  0000 C CNN
@@ -420,10 +420,10 @@ Text Label 3600 5150 0    60   ~ 0
 Text Label 3600 5450 0    60   ~ 0
 OUT
 $Comp
-L GND #PWR8
+L GND #PWR015
 U 1 1 54D232CA
 P 4500 5350
-F 0 "#PWR8" H 4500 5100 60  0001 C CNN
+F 0 "#PWR015" H 4500 5100 60  0001 C CNN
 F 1 "GND" H 4500 5200 60  0000 C CNN
 F 2 "" H 4500 5350 60  0000 C CNN
 F 3 "" H 4500 5350 60  0000 C CNN
@@ -431,10 +431,10 @@ F 3 "" H 4500 5350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR16
+L VCC #PWR016
 U 1 1 54D2426B
 P 7900 1350
-F 0 "#PWR16" H 7900 1200 60  0001 C CNN
+F 0 "#PWR016" H 7900 1200 60  0001 C CNN
 F 1 "VCC" H 7900 1500 60  0000 C CNN
 F 2 "" H 7900 1350 60  0000 C CNN
 F 3 "" H 7900 1350 60  0000 C CNN
@@ -447,16 +447,16 @@ U 1 1 54D2428C
 P 8100 1500
 F 0 "C6" H 8150 1600 50  0000 L CNN
 F 1 "1u" H 8150 1400 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 8138 1350 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 8138 1350 30  0001 C CNN
 F 3 "" H 8100 1500 60  0000 C CNN
 	1    8100 1500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR20
+L GND #PWR017
 U 1 1 54D2438E
 P 8100 1650
-F 0 "#PWR20" H 8100 1400 60  0001 C CNN
+F 0 "#PWR017" H 8100 1400 60  0001 C CNN
 F 1 "GND" H 8100 1500 60  0000 C CNN
 F 2 "" H 8100 1650 60  0000 C CNN
 F 3 "" H 8100 1650 60  0000 C CNN
@@ -464,10 +464,10 @@ F 3 "" H 8100 1650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR17
+L GND #PWR018
 U 1 1 54D24444
 P 7900 2750
-F 0 "#PWR17" H 7900 2500 60  0001 C CNN
+F 0 "#PWR018" H 7900 2500 60  0001 C CNN
 F 1 "GND" H 7900 2600 60  0000 C CNN
 F 2 "" H 7900 2750 60  0000 C CNN
 F 3 "" H 7900 2750 60  0000 C CNN
@@ -475,10 +475,10 @@ F 3 "" H 7900 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR019
 U 1 1 54D2456C
 P 7900 4200
-F 0 "#PWR19" H 7900 3950 60  0001 C CNN
+F 0 "#PWR019" H 7900 3950 60  0001 C CNN
 F 1 "GND" H 7900 4050 60  0000 C CNN
 F 2 "" H 7900 4200 60  0000 C CNN
 F 3 "" H 7900 4200 60  0000 C CNN
@@ -486,10 +486,10 @@ F 3 "" H 7900 4200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR18
+L VCC #PWR020
 U 1 1 54D2471A
 P 7900 3400
-F 0 "#PWR18" H 7900 3250 60  0001 C CNN
+F 0 "#PWR020" H 7900 3250 60  0001 C CNN
 F 1 "VCC" H 7900 3550 60  0000 C CNN
 F 2 "" H 7900 3400 60  0000 C CNN
 F 3 "" H 7900 3400 60  0000 C CNN
@@ -502,7 +502,7 @@ U 2 1 54D2AB47
 P 8000 3800
 F 0 "U2" H 8050 4000 60  0000 C CNN
 F 1 "LM324" H 8150 3600 50  0000 C CNN
-F 2 "SMD_Packages:SOIC-14_W" H 8000 3800 60  0001 C CNN
+F 2 "Housings_SSOP:TSSOP-14_4.4x5mm_Pitch0.65mm" H 8000 3800 60  0001 C CNN
 F 3 "" H 8000 3800 60  0000 C CNN
 	2    8000 3800
 	1    0    0    -1  
@@ -513,7 +513,7 @@ U 4 1 54D2ACCB
 P 9750 3050
 F 0 "U2" H 9800 3250 60  0000 C CNN
 F 1 "LM324" H 9900 2850 50  0000 C CNN
-F 2 "SMD_Packages:SOIC-14_W" H 9750 3050 60  0001 C CNN
+F 2 "Housings_SSOP:TSSOP-14_4.4x5mm_Pitch0.65mm" H 9750 3050 60  0001 C CNN
 F 3 "" H 9750 3050 60  0000 C CNN
 	4    9750 3050
 	1    0    0    1   
@@ -524,7 +524,7 @@ U 1 1 54D2AE95
 P 9900 4700
 F 0 "U2" H 9950 4900 60  0000 C CNN
 F 1 "LM324" H 10050 4500 50  0000 C CNN
-F 2 "SMD_Packages:SOIC-14_W" H 9900 4700 60  0001 C CNN
+F 2 "Housings_SSOP:TSSOP-14_4.4x5mm_Pitch0.65mm" H 9900 4700 60  0001 C CNN
 F 3 "" H 9900 4700 60  0000 C CNN
 	1    9900 4700
 	1    0    0    -1  
@@ -535,7 +535,7 @@ U 3 1 54D2AF04
 P 8000 2350
 F 0 "U2" H 8050 2550 60  0000 C CNN
 F 1 "LM324" H 8150 2150 50  0000 C CNN
-F 2 "SMD_Packages:SOIC-14_W" H 8000 2350 60  0001 C CNN
+F 2 "Housings_SSOP:TSSOP-14_4.4x5mm_Pitch0.65mm" H 8000 2350 60  0001 C CNN
 F 3 "" H 8000 2350 60  0000 C CNN
 	3    8000 2350
 	1    0    0    -1  
@@ -546,7 +546,7 @@ U 1 1 54D2B12F
 P 8900 2950
 F 0 "R9" V 8980 2950 50  0000 C CNN
 F 1 "10k 0.1%" V 8907 2951 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 8830 2950 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 8830 2950 30  0001 C CNN
 F 3 "" H 8900 2950 30  0000 C CNN
 	1    8900 2950
 	0    1    1    0   
@@ -557,7 +557,7 @@ U 1 1 54D2B156
 P 8900 3150
 F 0 "R10" V 8980 3150 50  0000 C CNN
 F 1 "10k 0.1%" V 8907 3151 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 8830 3150 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 8830 3150 30  0001 C CNN
 F 3 "" H 8900 3150 30  0000 C CNN
 	1    8900 3150
 	0    1    1    0   
@@ -568,16 +568,16 @@ U 1 1 54D2B17D
 P 9250 3300
 F 0 "R11" V 9330 3300 50  0000 C CNN
 F 1 "10k 0.1%" V 9257 3301 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 9180 3300 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9180 3300 30  0001 C CNN
 F 3 "" H 9250 3300 30  0000 C CNN
 	1    9250 3300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR21
+L GND #PWR021
 U 1 1 54D2B1BA
 P 9250 3450
-F 0 "#PWR21" H 9250 3200 60  0001 C CNN
+F 0 "#PWR021" H 9250 3200 60  0001 C CNN
 F 1 "GND" H 9250 3300 60  0000 C CNN
 F 2 "" H 9250 3450 60  0000 C CNN
 F 3 "" H 9250 3450 60  0000 C CNN
@@ -590,7 +590,7 @@ U 1 1 54D2B42B
 P 9650 2400
 F 0 "R12" V 9730 2400 50  0000 C CNN
 F 1 "10k 0.1%" V 9657 2401 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 9580 2400 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9580 2400 30  0001 C CNN
 F 3 "" H 9650 2400 30  0000 C CNN
 	1    9650 2400
 	0    1    1    0   
@@ -603,7 +603,7 @@ U 1 1 551426A3
 P 10550 4700
 F 0 "R13" V 10630 4700 50  0000 C CNN
 F 1 "330" V 10557 4701 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 10480 4700 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 10480 4700 30  0001 C CNN
 F 3 "" H 10550 4700 30  0000 C CNN
 	1    10550 4700
 	0    1    1    0   
@@ -614,7 +614,7 @@ U 1 1 5514275D
 P 10400 3050
 F 0 "R2" V 10480 3050 50  0000 C CNN
 F 1 "10k" V 10407 3051 50  0000 C CNN
-F 2 "SMD_Packages:SMD-0603_r" V 10330 3050 30  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 10330 3050 30  0001 C CNN
 F 3 "" H 10400 3050 30  0000 C CNN
 	1    10400 3050
 	0    1    1    0   
@@ -625,16 +625,16 @@ U 1 1 551427DB
 P 10550 3200
 F 0 "C7" H 10600 3300 50  0000 L CNN
 F 1 "1u" H 10600 3100 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 10588 3050 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 10588 3050 30  0001 C CNN
 F 3 "" H 10550 3200 60  0000 C CNN
 	1    10550 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR22
+L GND #PWR022
 U 1 1 55142877
 P 10550 3350
-F 0 "#PWR22" H 10550 3100 60  0001 C CNN
+F 0 "#PWR022" H 10550 3100 60  0001 C CNN
 F 1 "GND" H 10550 3200 60  0000 C CNN
 F 2 "" H 10550 3350 60  0000 C CNN
 F 3 "" H 10550 3350 60  0000 C CNN
@@ -642,7 +642,7 @@ F 3 "" H 10550 3350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4100 3100 4100 3650
+	4100 2250 4100 3650
 Wire Wire Line
 	4100 3650 3950 3650
 Wire Wire Line
@@ -655,8 +655,6 @@ Connection ~ 3650 4050
 Wire Wire Line
 	3200 2250 3450 2250
 Connection ~ 3200 2950
-Wire Wire Line
-	4100 2250 4100 3050
 Wire Wire Line
 	3750 2250 4100 2250
 Connection ~ 4100 2950
@@ -785,16 +783,16 @@ U 1 1 551434BC
 P 10700 4850
 F 0 "C8" H 10750 4950 50  0000 L CNN
 F 1 "1u" H 10750 4750 50  0000 L CNN
-F 2 "SMD_Packages:SMD-0603_c" H 10738 4700 30  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 10738 4700 30  0001 C CNN
 F 3 "" H 10700 4850 60  0000 C CNN
 	1    10700 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR023
 U 1 1 551436A0
 P 10700 5000
-F 0 "#PWR23" H 10700 4750 60  0001 C CNN
+F 0 "#PWR023" H 10700 4750 60  0001 C CNN
 F 1 "GND" H 10700 4850 60  0000 C CNN
 F 2 "" H 10700 5000 60  0000 C CNN
 F 3 "" H 10700 5000 60  0000 C CNN