diff --git a/pcbnew/signalIntegrity/ibisParser.cpp b/pcbnew/ibis/ibis_parser.cpp
similarity index 99%
rename from pcbnew/signalIntegrity/ibisParser.cpp
rename to pcbnew/ibis/ibis_parser.cpp
index 003e853629..0c4238e83f 100644
--- a/pcbnew/signalIntegrity/ibisParser.cpp
+++ b/pcbnew/ibis/ibis_parser.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "ibisParser.h"
+#include "ibis_parser.h"
 #include <sstream>
 #include <iterator>
 #include <locale_io.h> // KiCad header
@@ -2528,4 +2528,4 @@ bool IbisParser::onNewLine()
         c = m_buffer[m_lineOffset + m_lineIndex++];
     }
     return status;
-}
\ No newline at end of file
+}
diff --git a/pcbnew/signalIntegrity/ibisParser.h b/pcbnew/ibis/ibis_parser.h
similarity index 100%
rename from pcbnew/signalIntegrity/ibisParser.h
rename to pcbnew/ibis/ibis_parser.h
diff --git a/pcbnew/signalIntegrity/kibis.cpp b/pcbnew/ibis/kibis.cpp
similarity index 99%
rename from pcbnew/signalIntegrity/kibis.cpp
rename to pcbnew/ibis/kibis.cpp
index 19803fd5fc..509ffdfb0a 100644
--- a/pcbnew/signalIntegrity/kibis.cpp
+++ b/pcbnew/ibis/kibis.cpp
@@ -30,7 +30,7 @@
 
 
 #include "kibis.h"
-#include "ibisParser.h"
+#include "ibis_parser.h"
 #include <sstream>
 
 KIBIS_ANY::KIBIS_ANY( KIBIS* aTopLevel ) : IBIS_ANY( aTopLevel->m_reporter )
@@ -1235,4 +1235,4 @@ bool KIBIS_PIN::writeSpiceDiffDriver( std::string* aDest, std::string aName, KIB
     }
 
     return status;
-}
\ No newline at end of file
+}
diff --git a/pcbnew/signalIntegrity/kibis.h b/pcbnew/ibis/kibis.h
similarity index 99%
rename from pcbnew/signalIntegrity/kibis.h
rename to pcbnew/ibis/kibis.h
index f94fa12770..16acd1ff88 100644
--- a/pcbnew/signalIntegrity/kibis.h
+++ b/pcbnew/ibis/kibis.h
@@ -32,7 +32,7 @@
 #ifndef KIBIS_H
 #define KIBIS_H
 
-#include "ibisParser.h"
+#include "ibis_parser.h"
 
 class KIBIS_PIN;
 class KIBIS_FILE;
@@ -373,4 +373,4 @@ public:
     KIBIS_PIN* getPin( std::string aPinNumber );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
index 86ceadeb43..54327f4db1 100644
--- a/qa/CMakeLists.txt
+++ b/qa/CMakeLists.txt
@@ -48,5 +48,5 @@ add_subdirectory( unittests )
 add_subdirectory( tools )
 
 if( KICAD_SIGNAL_INTEGRITY )
-    add_subdirectory( signalIntegrity )
+    add_subdirectory( ibis )
 endif()
diff --git a/qa/signalIntegrity/CMakeLists.txt b/qa/ibis/CMakeLists.txt
similarity index 94%
rename from qa/signalIntegrity/CMakeLists.txt
rename to qa/ibis/CMakeLists.txt
index 0ede83834c..36b242b0c5 100644
--- a/qa/signalIntegrity/CMakeLists.txt
+++ b/qa/ibis/CMakeLists.txt
@@ -29,8 +29,8 @@ add_definitions(-DBOOST_TEST_DYN_LINK -DPCBNEW -DDRC_PROTO -DTEST_APP_NO_MAIN)
 
 add_executable( ibis_proto
     qaIbisParser.cpp
-    ../../pcbnew/signalIntegrity/ibisParser.cpp
-    ../../pcbnew/signalIntegrity/kibis.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/ibis/ibis_parser.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/ibis/kibis.cpp
 )
 
 add_dependencies( ibis_proto pnsrouter pcbcommon ${PCBNEW_IO_LIBRARIES} )
diff --git a/qa/signalIntegrity/ibis_v1_1.ibs b/qa/ibis/ibis_v1_1.ibs
similarity index 100%
rename from qa/signalIntegrity/ibis_v1_1.ibs
rename to qa/ibis/ibis_v1_1.ibs
diff --git a/qa/signalIntegrity/ibis_v2_1.ibs b/qa/ibis/ibis_v2_1.ibs
similarity index 100%
rename from qa/signalIntegrity/ibis_v2_1.ibs
rename to qa/ibis/ibis_v2_1.ibs
diff --git a/qa/signalIntegrity/ibis_v2_1.pkg b/qa/ibis/ibis_v2_1.pkg
similarity index 100%
rename from qa/signalIntegrity/ibis_v2_1.pkg
rename to qa/ibis/ibis_v2_1.pkg
diff --git a/qa/signalIntegrity/ibis_v3_2.ibs b/qa/ibis/ibis_v3_2.ibs
similarity index 100%
rename from qa/signalIntegrity/ibis_v3_2.ibs
rename to qa/ibis/ibis_v3_2.ibs
diff --git a/qa/signalIntegrity/ibis_v3_2.pkg b/qa/ibis/ibis_v3_2.pkg
similarity index 100%
rename from qa/signalIntegrity/ibis_v3_2.pkg
rename to qa/ibis/ibis_v3_2.pkg
diff --git a/qa/signalIntegrity/qaIbisParser.cpp b/qa/ibis/qaIbisParser.cpp
similarity index 98%
rename from qa/signalIntegrity/qaIbisParser.cpp
rename to qa/ibis/qaIbisParser.cpp
index 794631e564..e2360a5dfe 100644
--- a/qa/signalIntegrity/qaIbisParser.cpp
+++ b/qa/ibis/qaIbisParser.cpp
@@ -1,4 +1,4 @@
-#include "../../pcbnew/signalIntegrity/kibis.h"
+#include "../../pcbnew/ibis/kibis.h"
 #include <wx/textfile.h>
 
 int main( void )
@@ -86,4 +86,4 @@ int main( void )
     std::cout << "Done" << std::endl;
 
     return 1;
-}
\ No newline at end of file
+}