28 files changed, 28 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index 0e79f26..2d8d727 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,6 @@
 *~
 .*
-!/.gitignore
+!.gitignore
 
 build
 __*__
-
-required
-
-# Programs
-programs/kconfig_parser
-programs/solution_gen
diff --git a/conf.py b/conf.py
index 0de8bca..d022ff2 100644
--- a/conf.py
+++ b/conf.py
@@ -1,4 +1,5 @@
 import os
+from exceptions import MissingFile
 
 def pf(rfile):
 	"Relative patch of file is decoded to absolute acording to working tree."
@@ -32,7 +33,7 @@ solution_file = build_folder + '/solution'
 iteration_file = build_folder + '/iteration'
 
 # Programs paths
-kconfig_parser = checkXf(pf('programs/kconfig_parser'), 'You must build programs first.')
+kconfig_parser = checkXf(pf('scripts/kconfig_parser/parser'), 'You must build programs first.')
 
 # Programs output hide
 kconfig_parser_output = False
diff --git a/programs/src/kconfig_parser/Makefile b/programs/src/kconfig_parser/Makefile
deleted file mode 100644
index 6aee15d..0000000
--- a/programs/src/kconfig_parser/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.SUFFIXES:
-
-all: ../../kconfig_parser
-
-
-INPUT_FILES  = kconfig_parser.c
-INPUT_FILES += kconfig/zconf.tab.c \
-			   cnfexpr.c \
-			   symlist.c \
-			   output.c
-CFLAGS = -O0 -w -ggdb
-
-../../kconfig_parser: $(INPUT_FILES) kconfig/zconf.lex.c kconfig/zconf.hash.c
-	gcc $(CFLAGS) -o $@ $(INPUT_FILES)
-
-%.hash.c: %.gperf
-	gperf -t --output-file $@ -a -C -E -g -k '1,3,$$' -p -t $<
-
-%.lex.c: %.l
-	flex -o $@  -L -P zconf $<
-
-%.tab.c: %.y kconfig/zconf.lex.c kconfig/zconf.hash.c
-	bison -o $@ $< -p zconf -t -l
-
-clean:
-	$(RM) kconfig/zconf.tab.c kconfig/zconf.lex.c kconfig/zconf.hash.c
-	$(RM) ../../kconfig_parser
diff --git a/scripts/kconfig_parser/.gitignore b/scripts/kconfig_parser/.gitignore
new file mode 100644
index 0000000..763d456
--- /dev/null
+++ b/scripts/kconfig_parser/.gitignore
@@ -0,0 +1 @@
+parser
diff --git a/scripts/kconfig_parser/Makefile b/scripts/kconfig_parser/Makefile
new file mode 100644
index 0000000..a853f47
--- /dev/null
+++ b/scripts/kconfig_parser/Makefile
@@ -0,0 +1,24 @@
+.SUFFIXES:
+
+KCPARSER_INFILES  = parser.c \
+	       cnfexpr.c \
+	       symlist.c \
+	       output.c
+KCPARSER_INFILES += kconfig/zconf.tab.c
+KCPARSER_CFLAGS = -O0 -w -ggdb
+
+parser: $(KCPARSER_INFILES) kconfig/zconf.lex.c kconfig/zconf.hash.c
+	gcc $(KCPARSER_CFLAGS) -o $@ $(KCPARSER_INFILES)
+
+%.hash.c: %.gperf
+	gperf -t --output-file $@ -a -C -E -g -k '1,3,$$' -p -t $<
+
+%.lex.c: %.l
+	flex -o $@  -L -P zconf $<
+
+%.tab.c: %.y kconfig/zconf.lex.c kconfig/zconf.hash.c
+	bison -o $@ $< -p zconf -t -l
+
+clean:
+	$(RM) kconfig/zconf.tab.c kconfig/zconf.lex.c kconfig/zconf.hash.c
+	$(RM) parser
diff --git a/programs/src/kconfig_parser/cnfexpr.c b/scripts/kconfig_parser/cnfexpr.c
index 3e1dcd6..3e1dcd6 100644
--- a/programs/src/kconfig_parser/cnfexpr.c
+++ b/scripts/kconfig_parser/cnfexpr.c
diff --git a/programs/src/kconfig_parser/cnfexpr.h b/scripts/kconfig_parser/cnfexpr.h
index 0473368..0473368 100644
--- a/programs/src/kconfig_parser/cnfexpr.h
+++ b/scripts/kconfig_parser/cnfexpr.h
diff --git a/programs/src/kconfig_parser/kconfig/confdata.c b/scripts/kconfig_parser/kconfig/confdata.c
index f88d90f..f88d90f 100644
--- a/programs/src/kconfig_parser/kconfig/confdata.c
+++ b/scripts/kconfig_parser/kconfig/confdata.c
diff --git a/programs/src/kconfig_parser/kconfig/expr.c b/scripts/kconfig_parser/kconfig/expr.c
index d662652..d662652 100644
--- a/programs/src/kconfig_parser/kconfig/expr.c
+++ b/scripts/kconfig_parser/kconfig/expr.c
diff --git a/programs/src/kconfig_parser/kconfig/expr.h b/scripts/kconfig_parser/kconfig/expr.h
index 412ea8a..412ea8a 100644
--- a/programs/src/kconfig_parser/kconfig/expr.h
+++ b/scripts/kconfig_parser/kconfig/expr.h
diff --git a/programs/src/kconfig_parser/kconfig/list.h b/scripts/kconfig_parser/kconfig/list.h
index 685d80e..685d80e 100644
--- a/programs/src/kconfig_parser/kconfig/list.h
+++ b/scripts/kconfig_parser/kconfig/list.h
diff --git a/programs/src/kconfig_parser/kconfig/lkc.h b/scripts/kconfig_parser/kconfig/lkc.h
index d5daa7a..d5daa7a 100644
--- a/programs/src/kconfig_parser/kconfig/lkc.h
+++ b/scripts/kconfig_parser/kconfig/lkc.h
diff --git a/programs/src/kconfig_parser/kconfig/lkc_proto.h b/scripts/kconfig_parser/kconfig/lkc_proto.h
index ecdb965..ecdb965 100644
--- a/programs/src/kconfig_parser/kconfig/lkc_proto.h
+++ b/scripts/kconfig_parser/kconfig/lkc_proto.h
diff --git a/programs/src/kconfig_parser/kconfig/menu.c b/scripts/kconfig_parser/kconfig/menu.c
index a26cc5d..a26cc5d 100644
--- a/programs/src/kconfig_parser/kconfig/menu.c
+++ b/scripts/kconfig_parser/kconfig/menu.c
diff --git a/programs/src/kconfig_parser/kconfig/symbol.c b/scripts/kconfig_parser/kconfig/symbol.c
index 7caabdb..7caabdb 100644
--- a/programs/src/kconfig_parser/kconfig/symbol.c
+++ b/scripts/kconfig_parser/kconfig/symbol.c
diff --git a/programs/src/kconfig_parser/kconfig/util.c b/scripts/kconfig_parser/kconfig/util.c
index 94f9c83..94f9c83 100644
--- a/programs/src/kconfig_parser/kconfig/util.c
+++ b/scripts/kconfig_parser/kconfig/util.c
diff --git a/programs/src/kconfig_parser/kconfig/zconf.gperf b/scripts/kconfig_parser/kconfig/zconf.gperf
index b6ac02d..b6ac02d 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.gperf
+++ b/scripts/kconfig_parser/kconfig/zconf.gperf
diff --git a/programs/src/kconfig_parser/kconfig/zconf.hash.c b/scripts/kconfig_parser/kconfig/zconf.hash.c
index b8c1dfb..b8c1dfb 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.hash.c
+++ b/scripts/kconfig_parser/kconfig/zconf.hash.c
diff --git a/programs/src/kconfig_parser/kconfig/zconf.l b/scripts/kconfig_parser/kconfig/zconf.l
index 6c62d93..6c62d93 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.l
+++ b/scripts/kconfig_parser/kconfig/zconf.l
diff --git a/programs/src/kconfig_parser/kconfig/zconf.lex.c b/scripts/kconfig_parser/kconfig/zconf.lex.c
index e3b33bd..e3b33bd 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.lex.c
+++ b/scripts/kconfig_parser/kconfig/zconf.lex.c
diff --git a/programs/src/kconfig_parser/kconfig/zconf.tab.c b/scripts/kconfig_parser/kconfig/zconf.tab.c
index 0864c7d..0864c7d 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.tab.c
+++ b/scripts/kconfig_parser/kconfig/zconf.tab.c
diff --git a/programs/src/kconfig_parser/kconfig/zconf.y b/scripts/kconfig_parser/kconfig/zconf.y
index 0f683cf..0f683cf 100644
--- a/programs/src/kconfig_parser/kconfig/zconf.y
+++ b/scripts/kconfig_parser/kconfig/zconf.y
diff --git a/programs/src/kconfig_parser/macros.h b/scripts/kconfig_parser/macros.h
index 13a5d43..13a5d43 100644
--- a/programs/src/kconfig_parser/macros.h
+++ b/scripts/kconfig_parser/macros.h
diff --git a/programs/src/kconfig_parser/output.c b/scripts/kconfig_parser/output.c
index 989f4f0..989f4f0 100644
--- a/programs/src/kconfig_parser/output.c
+++ b/scripts/kconfig_parser/output.c
diff --git a/programs/src/kconfig_parser/output.h b/scripts/kconfig_parser/output.h
index b38c0bc..b38c0bc 100644
--- a/programs/src/kconfig_parser/output.h
+++ b/scripts/kconfig_parser/output.h
diff --git a/programs/src/kconfig_parser/kconfig_parser.c b/scripts/kconfig_parser/parser.c
index a0425db..a0425db 100644
--- a/programs/src/kconfig_parser/kconfig_parser.c
+++ b/scripts/kconfig_parser/parser.c
diff --git a/programs/src/kconfig_parser/symlist.c b/scripts/kconfig_parser/symlist.c
index 5423163..5423163 100644
--- a/programs/src/kconfig_parser/symlist.c
+++ b/scripts/kconfig_parser/symlist.c
diff --git a/programs/src/kconfig_parser/symlist.h b/scripts/kconfig_parser/symlist.h
index 88bf4b0..88bf4b0 100644
--- a/programs/src/kconfig_parser/symlist.h
+++ b/scripts/kconfig_parser/symlist.h