diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17fea4ef..639e9414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ if(BUILD_ADDRESS_SANITIZER)
 endif()
 
 # FOR HANDLING ENABLE/DISABLE OPTIONAL BACKWARD COMPATIBILITY for FILE/FOLDER REORG
-option(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY "Build with file/folder reorg with backward compatibility enabled" ON)
+option(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY "Build with file/folder reorg with backward compatibility enabled" OFF)
 if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY AND NOT WIN32)
   rocm_wrap_header_dir(
     ${CMAKE_SOURCE_DIR}/library/include
diff --git a/clients/bench/CMakeLists.txt b/clients/bench/CMakeLists.txt
index e15b378f..2c255807 100644
--- a/clients/bench/CMakeLists.txt
+++ b/clients/bench/CMakeLists.txt
@@ -111,7 +111,7 @@ foreach( bench ${bench_list})
     # We need to include both rocfft.h and rocfft-export.h
     target_include_directories( ${bench}
       PRIVATE
-      ${CMAKE_BINARY_DIR}/include/rocfft
+      ${CMAKE_BINARY_DIR}/include
       ${CMAKE_CURRENT_SOURCE_DIR}/../../library/include/
       ${HIP_CLANG_ROOT}/include
       )
diff --git a/clients/bench/bench.cpp b/clients/bench/bench.cpp
index 6993ff77..a944d326 100644
--- a/clients/bench/bench.cpp
+++ b/clients/bench/bench.cpp
@@ -26,7 +26,7 @@
 #include "../../shared/gpubuf.h"
 #include "../../shared/rocfft_params.h"
 #include "bench.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
diff --git a/clients/bench/bench.h b/clients/bench/bench.h
index d85be71c..45c018cb 100644
--- a/clients/bench/bench.h
+++ b/clients/bench/bench.h
@@ -21,7 +21,7 @@
 #ifndef ROCFFT_BENCH_H
 #define ROCFFT_BENCH_H
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <boost/program_options.hpp>
 #include <hip/hip_runtime_api.h>
 #include <vector>
diff --git a/clients/bench/dyna-bench.cpp b/clients/bench/dyna-bench.cpp
index a7707d1a..2ea886d5 100644
--- a/clients/bench/dyna-bench.cpp
+++ b/clients/bench/dyna-bench.cpp
@@ -40,7 +40,7 @@
 #include "../../shared/gpubuf.h"
 #include "../../shared/rocfft_params.h"
 #include "bench.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
diff --git a/clients/samples/fixed-16/fixed-16-double.cpp b/clients/samples/fixed-16/fixed-16-double.cpp
index 96861359..9b28d6a6 100644
--- a/clients/samples/fixed-16/fixed-16-double.cpp
+++ b/clients/samples/fixed-16/fixed-16-double.cpp
@@ -20,7 +20,7 @@
 * THE SOFTWARE.
 *******************************************************************************/
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
 #include <iostream>
diff --git a/clients/samples/fixed-16/fixed-16-float.cpp b/clients/samples/fixed-16/fixed-16-float.cpp
index dc249060..9c856944 100644
--- a/clients/samples/fixed-16/fixed-16-float.cpp
+++ b/clients/samples/fixed-16/fixed-16-float.cpp
@@ -20,7 +20,7 @@
 * THE SOFTWARE.
 *******************************************************************************/
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
 #include <iostream>
diff --git a/clients/samples/fixed-16/fixed-16-half.cpp b/clients/samples/fixed-16/fixed-16-half.cpp
index d528a539..4190d4e7 100644
--- a/clients/samples/fixed-16/fixed-16-half.cpp
+++ b/clients/samples/fixed-16/fixed-16-half.cpp
@@ -20,7 +20,7 @@
 * THE SOFTWARE.
 *******************************************************************************/
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_fp16.h>
 #include <hip/hip_runtime_api.h>
 #include <iostream>
diff --git a/clients/samples/fixed-large/fixed-large-double.cpp b/clients/samples/fixed-large/fixed-large-double.cpp
index 90a0d2c9..557e0092 100644
--- a/clients/samples/fixed-large/fixed-large-double.cpp
+++ b/clients/samples/fixed-large/fixed-large-double.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <vector>
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
 
diff --git a/clients/samples/fixed-large/fixed-large-float.cpp b/clients/samples/fixed-large/fixed-large-float.cpp
index 410c7089..44151901 100644
--- a/clients/samples/fixed-large/fixed-large-float.cpp
+++ b/clients/samples/fixed-large/fixed-large-float.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <vector>
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
 
diff --git a/clients/samples/rocfft/rocfft_example_callback.cpp b/clients/samples/rocfft/rocfft_example_callback.cpp
index df463d37..a6c2dd3d 100644
--- a/clients/samples/rocfft/rocfft_example_callback.cpp
+++ b/clients/samples/rocfft/rocfft_example_callback.cpp
@@ -20,7 +20,7 @@
 * THE SOFTWARE.
 *******************************************************************************/
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <hip/hip_complex.h>
 #include <hip/hip_runtime.h>
 #include <hip/hip_vector_types.h>
diff --git a/clients/samples/rocfft/rocfft_example_complexcomplex.cpp b/clients/samples/rocfft/rocfft_example_complexcomplex.cpp
index 87a84e70..2203f428 100644
--- a/clients/samples/rocfft/rocfft_example_complexcomplex.cpp
+++ b/clients/samples/rocfft/rocfft_example_complexcomplex.cpp
@@ -28,7 +28,7 @@ namespace po = boost::program_options;
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include <rocfft.h>
+#include <rocfft/rocfft.h>
 
 #include "examplekernels.h"
 #include "exampleutils.h"
diff --git a/clients/samples/rocfft/rocfft_example_realcomplex.cpp b/clients/samples/rocfft/rocfft_example_realcomplex.cpp
index 35d3dcc5..77334b4d 100644
--- a/clients/samples/rocfft/rocfft_example_realcomplex.cpp
+++ b/clients/samples/rocfft/rocfft_example_realcomplex.cpp
@@ -28,7 +28,7 @@ namespace po = boost::program_options;
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>
-#include <rocfft.h>
+#include <rocfft/rocfft.h>
 
 #include "examplekernels.h"
 #include "exampleutils.h"
diff --git a/clients/samples/rocfft/rocfft_example_set_stream.cpp b/clients/samples/rocfft/rocfft_example_set_stream.cpp
index 0d54e78d..48d4e199 100644
--- a/clients/samples/rocfft/rocfft_example_set_stream.cpp
+++ b/clients/samples/rocfft/rocfft_example_set_stream.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <cassert>
 #include <hip/hip_runtime_api.h>
 #include <iostream>
diff --git a/clients/tests/default_callbacks_test.cpp b/clients/tests/default_callbacks_test.cpp
index 1e185b9e..1fe838bb 100644
--- a/clients/tests/default_callbacks_test.cpp
+++ b/clients/tests/default_callbacks_test.cpp
@@ -28,7 +28,7 @@
 
 #include "../../shared/rocfft_params.h"
 #include "fftw_transform.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 
 // -------------------------------------
 // default load callback definitions
diff --git a/clients/tests/gtest_main.cpp b/clients/tests/gtest_main.cpp
index f73fba1d..43cb5eb5 100644
--- a/clients/tests/gtest_main.cpp
+++ b/clients/tests/gtest_main.cpp
@@ -34,7 +34,7 @@
 #include "../../shared/concurrency.h"
 #include "../../shared/environment.h"
 #include "../../shared/work_queue.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include "rocfft_accuracy_test.h"
 #include "test_params.h"
 
diff --git a/clients/tests/hermitian_test.cpp b/clients/tests/hermitian_test.cpp
index b73fdd2c..515f9343 100644
--- a/clients/tests/hermitian_test.cpp
+++ b/clients/tests/hermitian_test.cpp
@@ -23,7 +23,7 @@
 #include "../samples/rocfft/examplekernels.h"
 #include "../samples/rocfft/exampleutils.h"
 #include "accuracy_test.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include <functional>
 #include <gtest/gtest.h>
 #include <hip/hip_runtime_api.h>
diff --git a/clients/tests/hipGraph_test.cpp b/clients/tests/hipGraph_test.cpp
index 46722397..59ccaf09 100644
--- a/clients/tests/hipGraph_test.cpp
+++ b/clients/tests/hipGraph_test.cpp
@@ -22,7 +22,7 @@
 #include "../../shared/gpubuf.h"
 #include "../../shared/rocfft_params.h"
 #include "accuracy_test.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include "rocfft_against_fftw.h"
 #include <gtest/gtest.h>
 #include <hip/hip_runtime.h>
diff --git a/clients/tests/multithread_test.cpp b/clients/tests/multithread_test.cpp
index 92833ca8..1a89fa1f 100644
--- a/clients/tests/multithread_test.cpp
+++ b/clients/tests/multithread_test.cpp
@@ -21,7 +21,7 @@
 #include "../../shared/gpubuf.h"
 #include "../../shared/rocfft_params.h"
 #include "accuracy_test.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include "rocfft_against_fftw.h"
 #include <gtest/gtest.h>
 #include <hip/hip_runtime.h>
diff --git a/clients/tests/rocfft_accuracy_test.cpp b/clients/tests/rocfft_accuracy_test.cpp
index 10cac2dd..a6f2f510 100644
--- a/clients/tests/rocfft_accuracy_test.cpp
+++ b/clients/tests/rocfft_accuracy_test.cpp
@@ -29,7 +29,7 @@
 
 #include "../../shared/gpubuf.h"
 #include "fftw_transform.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 #include "rocfft_against_fftw.h"
 
 void fft_vs_reference(rocfft_params& params, bool round_trip)
diff --git a/clients/tests/test_params.h b/clients/tests/test_params.h
index 5ab0ee4a..6320a5df 100644
--- a/clients/tests/test_params.h
+++ b/clients/tests/test_params.h
@@ -22,7 +22,7 @@
 #ifndef TESTCONSTANTS_H
 #define TESTCONSTANTS_H
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 
 #include <stdexcept>
 
diff --git a/clients/tests/unit_test.cpp b/clients/tests/unit_test.cpp
index e0a02a07..cbce1a4d 100644
--- a/clients/tests/unit_test.cpp
+++ b/clients/tests/unit_test.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 
 #include "../../shared/concurrency.h"
 #include "../../shared/environment.h"
diff --git a/install.sh b/install.sh
index 01d17fbf..dd65df72 100755
--- a/install.sh
+++ b/install.sh
@@ -279,7 +279,7 @@ group_num=false
 manual_small_arg=false
 manual_large_arg=false
 build_address_sanitizer=false
-build_freorg_bkwdcomp=true
+build_freorg_bkwdcomp=false
 solmap_data_folder=false
 
 # #################################################
diff --git a/shared/rocfft_params.h b/shared/rocfft_params.h
index 9d1df2dc..86e2518d 100644
--- a/shared/rocfft_params.h
+++ b/shared/rocfft_params.h
@@ -23,7 +23,7 @@
 
 #include "../shared/fft_params.h"
 #include "../shared/gpubuf.h"
-#include "rocfft.h"
+#include "rocfft/rocfft.h"
 
 // Return the string of the rocfft_status code
 static std::string rocfft_status_to_string(const rocfft_status ret)