diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile
--- a/FSW-qt/Makefile
+++ b/FSW-qt/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bin/fsw
-# Generated by qmake (2.01a) (Qt 4.8.6) on: Mon May 26 14:45:46 2014
+# Generated by qmake (2.01a) (Qt 4.8.6) on: Mon May 26 15:36:46 2014
 # Project:  fsw-qt.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
@@ -13,7 +13,7 @@ CXX           = sparc-rtems-g++
 DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=7 -DPRINT_MESSAGES_ON_CONSOLE
 CFLAGS        = -pipe -O3 -Wall $(DEFINES)
 CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
-INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/basic_parameters
+INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
 LINK          = sparc-rtems-g++
 LFLAGS        = 
 LIBS          = $(SUBLIBS)    
@@ -52,12 +52,12 @@ SOURCES       = ../src/wf_handler.c \
 		../src/tc_load_dump_parameters.c \
 		../src/tm_lfr_tc_exe.c \
 		../src/tc_acceptance.c \
-		../src/basic_parameters/basic_parameters.c \
 		../src/processing/fsw_processing.c \
 		../src/processing/avf0_prc0.c \
 		../src/processing/avf1_prc1.c \
 		../src/processing/avf2_prc2.c \
-		../src/lfr_cpu_usage_report.c 
+		../src/lfr_cpu_usage_report.c \
+		../src/LFR_basic-parameters/basic_parameters.c 
 OBJECTS       = obj/wf_handler.o \
 		obj/tc_handler.o \
 		obj/fsw_misc.o \
@@ -67,12 +67,12 @@ OBJECTS       = obj/wf_handler.o \
 		obj/tc_load_dump_parameters.o \
 		obj/tm_lfr_tc_exe.o \
 		obj/tc_acceptance.o \
-		obj/basic_parameters.o \
 		obj/fsw_processing.o \
 		obj/avf0_prc0.o \
 		obj/avf1_prc1.o \
 		obj/avf2_prc2.o \
-		obj/lfr_cpu_usage_report.o
+		obj/lfr_cpu_usage_report.o \
+		obj/basic_parameters.o
 DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
 		/usr/lib64/qt4/mkspecs/common/linux.conf \
 		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
@@ -245,10 +245,6 @@ obj/tm_lfr_tc_exe.o: ../src/tm_lfr_tc_ex
 obj/tc_acceptance.o: ../src/tc_acceptance.c 
 	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/tc_acceptance.o ../src/tc_acceptance.c
 
-obj/basic_parameters.o: ../src/basic_parameters/basic_parameters.c ../src/basic_parameters/basic_parameters.h \
-		../src/basic_parameters/basic_parameters_params.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/basic_parameters.o ../src/basic_parameters/basic_parameters.c
-
 obj/fsw_processing.o: ../src/processing/fsw_processing.c 
 	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_processing.o ../src/processing/fsw_processing.c
 
@@ -264,6 +260,9 @@ obj/avf2_prc2.o: ../src/processing/avf2_
 obj/lfr_cpu_usage_report.o: ../src/lfr_cpu_usage_report.c 
 	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/lfr_cpu_usage_report.o ../src/lfr_cpu_usage_report.c
 
+obj/basic_parameters.o: ../src/LFR_basic-parameters/basic_parameters.c 
+	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/basic_parameters.o ../src/LFR_basic-parameters/basic_parameters.c
+
 ####### Install
 
 install:   FORCE
diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro
--- a/FSW-qt/fsw-qt.pro
+++ b/FSW-qt/fsw-qt.pro
@@ -51,7 +51,7 @@ INCLUDEPATH += \
     ../src \
     ../header \
     ../header/processing \
-    ../src/basic_parameters
+    ../src/LFR_basic-parameters
 
 SOURCES += \
     ../src/wf_handler.c \
@@ -63,12 +63,12 @@ SOURCES += \
     ../src/tc_load_dump_parameters.c \
     ../src/tm_lfr_tc_exe.c \
     ../src/tc_acceptance.c \
-    ../src/basic_parameters/basic_parameters.c \
     ../src/processing/fsw_processing.c \
     ../src/processing/avf0_prc0.c \
     ../src/processing/avf1_prc1.c \
     ../src/processing/avf2_prc2.c \
-    ../src/lfr_cpu_usage_report.c
+    ../src/lfr_cpu_usage_report.c \
+    ../src/LFR_basic-parameters/basic_parameters.c
 
 HEADERS += \
     ../header/wf_handler.h \
@@ -83,12 +83,13 @@ HEADERS += \
     ../header/tm_lfr_tc_exe.h \
     ../header/tc_acceptance.h \
     ../header/fsw_params_nb_bytes.h \
-    ../src/basic_parameters/basic_parameters.h \
     ../header/fsw_params_processing.h \
     ../header/processing/fsw_processing.h \
     ../header/processing/avf0_prc0.h \
     ../header/processing/avf1_prc1.h \
     ../header/processing/avf2_prc2.h \
     ../header/fsw_params_wf_handler.h \
-    ../header/lfr_cpu_usage_report.h
+    ../header/lfr_cpu_usage_report.h \
+    ../src/LFR_basic-parameters/basic_parameters.h \
+    ../src/LFR_basic-parameters/basic_parameters_params.h
 
diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user
--- a/FSW-qt/fsw-qt.pro.user
+++ b/FSW-qt/fsw-qt.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2014-05-26T15:22:07. -->
+<!-- Written by QtCreator 3.0.1, 2014-05-26T15:34:26. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>