lcompilers · ubaidsk · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025
diff --git a/.gitignore b/.gitignore
@@ -40,7 +40,7 @@ CPackConfig.cmake
 CPackSourceConfig.cmake
 _CPack_Packages
 /CMakeSettings.json
-src/libasr/libasr.a.*
+src/libasr/src/libasr/libasr.a.*
 
 ## libraries
 *.a
@@ -56,10 +56,10 @@ lpython/ast/ast.py
 lpython/asr/asr.py
 src/lpython/ast.h
 src/lpython/asr.h
-src/libasr/asr.h
-src/libasr/wasm_visitor.h
-src/libasr/pass/intrinsic_function_registry_util.h
-src/libasr/config.h
+src/libasr/src/libasr/asr.h
+src/libasr/src/libasr/wasm_visitor.h
+src/libasr/src/libasr/pass/intrinsic_function_registry_util.h
+src/libasr/src/libasr/config.h
 share/jupyter/kernels/fortran/kernel.json
 share/jupyter/kernels/lpython/kernel.json
 src/runtime/*.o.empty.c

diff --git a/build0.sh b/build0.sh
@@ -8,13 +8,13 @@ ci/version.sh
 # Generate a Python AST from Python.asdl (Python)
 python grammar/asdl_py.py
 # Generate a Python AST from Python.asdl (C++)
-python src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
+python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
 # Generate a Fortran ASR from ASR.asdl (C++)
-python src/libasr/asdl_cpp.py src/libasr/ASR.asdl src/libasr/asr.h
-# Generate a wasm_visitor.h from src/libasr/wasm_instructions.txt (C++)
-python src/libasr/wasm_instructions_visitor.py
+python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
+# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
+python src/libasr/src/libasr/wasm_instructions_visitor.py
 # Generate the intrinsic_function_registry_util.h (C++)
-python src/libasr/intrinsic_func_registry_util_gen.py
+python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
 
 # Generate the tokenizer and parser
 (cd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp)

diff --git a/build0_win.xsh b/build0_win.xsh
@@ -7,13 +7,13 @@ echo @(version) > version
 # Generate a Python AST from Python.asdl (Python)
 python grammar/asdl_py.py
 # Generate a Python AST from Python.asdl (C++)
-python src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
+python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
 # Generate a Fortran ASR from ASR.asdl (C++)
-python src/libasr/asdl_cpp.py src/libasr/ASR.asdl src/libasr/asr.h
-# Generate a wasm_visitor.h from src/libasr/wasm_instructions.txt (C++)
-python src/libasr/wasm_instructions_visitor.py
+python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
+# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
+python src/libasr/src/libasr/wasm_instructions_visitor.py
 # Generate the intrinsic_function_registry_util.h (C++)
-python src/libasr/intrinsic_func_registry_util_gen.py
+python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
 
 # Generate the tokenizer and parser
 pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

diff --git a/ci/build.xsh b/ci/build.xsh
@@ -27,15 +27,15 @@ llvm-config --components
 bash ci/version.sh
 
 # Generate a Fortran ASR from ASR.asdl (C++)
-python src/libasr/asdl_cpp.py src/libasr/ASR.asdl src/libasr/asr.h
+python src/libasr/src/libasr/asdl_cpp.py src/libasr/src/libasr/ASR.asdl src/libasr/src/libasr/asr.h
 # Generate a Python AST from Python.asdl (C++)
-python src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
+python src/libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
 # Generate a Python AST from Python.asdl (Python)
 python grammar/asdl_py.py
-# Generate a wasm_visitor.h from src/libasr/wasm_instructions.txt (C++)
-python src/libasr/wasm_instructions_visitor.py
+# Generate a wasm_visitor.h from src/libasr/src/libasr/wasm_instructions.txt (C++)
+python src/libasr/src/libasr/wasm_instructions_visitor.py
 # Generate the intrinsic_function_registry_util.h (C++)
-python src/libasr/intrinsic_func_registry_util_gen.py
+python src/libasr/src/libasr/intrinsic_func_registry_util_gen.py
 
 # Generate the tokenizer and parser
 pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

diff --git a/grammar/asdl_py.py b/grammar/asdl_py.py
@@ -5,7 +5,7 @@
 import sys
 import os
 
-sys.path.append("src/libasr")
+sys.path.append("src/libasr/src/libasr")
 import asdl
 
 products = []

diff --git a/run_tests.py b/run_tests.py
@@ -4,7 +4,7 @@
 import os
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__)))
-sys.path.append(os.path.join(ROOT_DIR, "src", "libasr"))
+sys.path.append(os.path.join(ROOT_DIR, "src", "libasr", "src", "libasr"))
 
 from compiler_tester.tester import color, fg, log, run_test, style, tester_main
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(libasr)
+add_subdirectory(libasr/src/libasr)
 add_subdirectory(tests)
 add_subdirectory(lpython)
 add_subdirectory(bin)

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -33,7 +33,7 @@ if (WITH_STACKTRACE AND APPLE AND CMAKE_CXX_COMPILER_ID MATCHES Clang)
         add_custom_command(
             TARGET lpython
             POST_BUILD
-            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../libasr/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
+            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../libasr/src/libasr/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
         )
     endif()
 endif()

diff --git a/src/bin/lpython.cpp b/src/bin/lpython.cpp
@@ -856,9 +856,9 @@ int interactive_python_repl(
     std::cout << "    - History (Keys: Up, Down)" << std::endl;
 
     std::vector<std::string> history;
-    
+
     std::function<bool(std::string)> iscomplete = determine_completeness;
-    
+
     std::string code_string;
     size_t cell_count = 0;
     while (true) {
@@ -1013,8 +1013,8 @@ int interactive_python_repl(
             }
             case (LCompilers::PythonCompiler::EvalResult::struct_type) : {
                 if (verbose) {
-                    std::cout << "Return type: " 
-                        << LCompilers::ASRUtils::get_type_code(r.structure.ttype) 
+                    std::cout << "Return type: "
+                        << LCompilers::ASRUtils::get_type_code(r.structure.ttype)
                         << std::endl;
                 }
                 if (verbose) section("Result:");
@@ -2261,9 +2261,9 @@ int main(int argc, char *argv[])
 #else
                     cmd += "llvm-dwarfdump --debug-line " + basename + ".out > ";
 #endif
-                    cmd += basename + "_ldd.txt && (cd src/libasr; ./dwarf_convert.py ../../"
-                        + basename + "_ldd.txt ../../" + basename + "_lines.txt ../../"
-                        + basename + "_lines.dat && ./dat_convert.py ../../"
+                    cmd += basename + "_ldd.txt && (cd src/libasr/src/libasr; ./dwarf_convert.py ../../../../"
+                        + basename + "_ldd.txt ../../../../" + basename + "_lines.txt ../../../../"
+                        + basename + "_lines.dat && ./dat_convert.py ../../../../"
                         + basename + "_lines.dat)";
                     int status = system(cmd.c_str());
                     if ( status != 0 ) {

diff --git a/src/libasr/ASR.asdl → src/libasr/src/libasr/ASR.asdl b/src/libasr/ASR.asdl → src/libasr/src/libasr/ASR.asdl
diff --git a/src/libasr/CMakeLists.txt → src/libasr/src/libasr/CMakeLists.txt b/src/libasr/CMakeLists.txt → src/libasr/src/libasr/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(libasr)
+project(libasr/src/libasr)
 
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 17
@@ -103,8 +103,8 @@ if (WITH_LLVM)
     endif()
 endif()
 add_library(asr STATIC ${SRC})
-target_include_directories(asr BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)
-target_include_directories(asr BEFORE PUBLIC ${libasr_BINARY_DIR}/..)
+target_include_directories(asr BEFORE PUBLIC ${libasr/src/libasr_SOURCE_DIR}/..)
+target_include_directories(asr BEFORE PUBLIC ${libasr/src/libasr_BINARY_DIR}/..)
 if (WITH_BFD)
     target_link_libraries(asr p::bfd)
 endif()

diff --git a/src/libasr/alloc.h → src/libasr/src/libasr/alloc.h b/src/libasr/alloc.h → src/libasr/src/libasr/alloc.h
diff --git a/src/libasr/asdl.py → src/libasr/src/libasr/asdl.py b/src/libasr/asdl.py → src/libasr/src/libasr/asdl.py
diff --git a/src/libasr/asdl_cpp.py → src/libasr/src/libasr/asdl_cpp.py b/src/libasr/asdl_cpp.py → src/libasr/src/libasr/asdl_cpp.py
diff --git a/src/libasr/asr_builder.h → src/libasr/src/libasr/asr_builder.h b/src/libasr/asr_builder.h → src/libasr/src/libasr/asr_builder.h
diff --git a/src/libasr/asr_scopes.cpp → src/libasr/src/libasr/asr_scopes.cpp b/src/libasr/asr_scopes.cpp → src/libasr/src/libasr/asr_scopes.cpp
diff --git a/src/libasr/asr_scopes.h → src/libasr/src/libasr/asr_scopes.h b/src/libasr/asr_scopes.h → src/libasr/src/libasr/asr_scopes.h
diff --git a/src/libasr/asr_utils.cpp → src/libasr/src/libasr/asr_utils.cpp b/src/libasr/asr_utils.cpp → src/libasr/src/libasr/asr_utils.cpp
diff --git a/src/libasr/asr_utils.h → src/libasr/src/libasr/asr_utils.h b/src/libasr/asr_utils.h → src/libasr/src/libasr/asr_utils.h
diff --git a/src/libasr/asr_verify.cpp → src/libasr/src/libasr/asr_verify.cpp b/src/libasr/asr_verify.cpp → src/libasr/src/libasr/asr_verify.cpp
diff --git a/src/libasr/asr_verify.h → src/libasr/src/libasr/asr_verify.h b/src/libasr/asr_verify.h → src/libasr/src/libasr/asr_verify.h
diff --git a/src/libasr/assert.h → src/libasr/src/libasr/assert.h b/src/libasr/assert.h → src/libasr/src/libasr/assert.h
diff --git a/src/libasr/bigint.h → src/libasr/src/libasr/bigint.h b/src/libasr/bigint.h → src/libasr/src/libasr/bigint.h
diff --git a/src/libasr/bwriter.h → src/libasr/src/libasr/bwriter.h b/src/libasr/bwriter.h → src/libasr/src/libasr/bwriter.h
diff --git a/src/libasr/casting_utils.cpp → src/libasr/src/libasr/casting_utils.cpp b/src/libasr/casting_utils.cpp → src/libasr/src/libasr/casting_utils.cpp
diff --git a/src/libasr/casting_utils.h → src/libasr/src/libasr/casting_utils.h b/src/libasr/casting_utils.h → src/libasr/src/libasr/casting_utils.h
diff --git a/src/libasr/codegen/KaleidoscopeJIT.h → ...basr/src/libasr/codegen/KaleidoscopeJIT.h b/src/libasr/codegen/KaleidoscopeJIT.h → ...basr/src/libasr/codegen/KaleidoscopeJIT.h
diff --git a/src/libasr/codegen/asr_to_c.cpp → src/libasr/src/libasr/codegen/asr_to_c.cpp b/src/libasr/codegen/asr_to_c.cpp → src/libasr/src/libasr/codegen/asr_to_c.cpp
diff --git a/src/libasr/codegen/asr_to_c.h → src/libasr/src/libasr/codegen/asr_to_c.h b/src/libasr/codegen/asr_to_c.h → src/libasr/src/libasr/codegen/asr_to_c.h
diff --git a/src/libasr/codegen/asr_to_c_cpp.h → src/libasr/src/libasr/codegen/asr_to_c_cpp.h b/src/libasr/codegen/asr_to_c_cpp.h → src/libasr/src/libasr/codegen/asr_to_c_cpp.h
diff --git a/src/libasr/codegen/asr_to_cpp.cpp → src/libasr/src/libasr/codegen/asr_to_cpp.cpp b/src/libasr/codegen/asr_to_cpp.cpp → src/libasr/src/libasr/codegen/asr_to_cpp.cpp
diff --git a/src/libasr/codegen/asr_to_cpp.h → src/libasr/src/libasr/codegen/asr_to_cpp.h b/src/libasr/codegen/asr_to_cpp.h → src/libasr/src/libasr/codegen/asr_to_cpp.h
diff --git a/src/libasr/codegen/asr_to_fortran.cpp → ...asr/src/libasr/codegen/asr_to_fortran.cpp b/src/libasr/codegen/asr_to_fortran.cpp → ...asr/src/libasr/codegen/asr_to_fortran.cpp
diff --git a/src/libasr/codegen/asr_to_fortran.h → ...ibasr/src/libasr/codegen/asr_to_fortran.h b/src/libasr/codegen/asr_to_fortran.h → ...ibasr/src/libasr/codegen/asr_to_fortran.h
diff --git a/src/libasr/codegen/asr_to_julia.cpp → ...ibasr/src/libasr/codegen/asr_to_julia.cpp b/src/libasr/codegen/asr_to_julia.cpp → ...ibasr/src/libasr/codegen/asr_to_julia.cpp
diff --git a/src/libasr/codegen/asr_to_julia.h → src/libasr/src/libasr/codegen/asr_to_julia.h b/src/libasr/codegen/asr_to_julia.h → src/libasr/src/libasr/codegen/asr_to_julia.h
diff --git a/src/libasr/codegen/asr_to_llvm.cpp → ...libasr/src/libasr/codegen/asr_to_llvm.cpp b/src/libasr/codegen/asr_to_llvm.cpp → ...libasr/src/libasr/codegen/asr_to_llvm.cpp
diff --git a/src/libasr/codegen/asr_to_llvm.h → src/libasr/src/libasr/codegen/asr_to_llvm.h b/src/libasr/codegen/asr_to_llvm.h → src/libasr/src/libasr/codegen/asr_to_llvm.h
diff --git a/src/libasr/codegen/asr_to_py.cpp → src/libasr/src/libasr/codegen/asr_to_py.cpp b/src/libasr/codegen/asr_to_py.cpp → src/libasr/src/libasr/codegen/asr_to_py.cpp
diff --git a/src/libasr/codegen/asr_to_py.h → src/libasr/src/libasr/codegen/asr_to_py.h b/src/libasr/codegen/asr_to_py.h → src/libasr/src/libasr/codegen/asr_to_py.h
diff --git a/src/libasr/codegen/asr_to_python.cpp → ...basr/src/libasr/codegen/asr_to_python.cpp b/src/libasr/codegen/asr_to_python.cpp → ...basr/src/libasr/codegen/asr_to_python.cpp
diff --git a/src/libasr/codegen/asr_to_python.h → ...libasr/src/libasr/codegen/asr_to_python.h b/src/libasr/codegen/asr_to_python.h → ...libasr/src/libasr/codegen/asr_to_python.h
diff --git a/src/libasr/codegen/asr_to_wasm.cpp → ...libasr/src/libasr/codegen/asr_to_wasm.cpp b/src/libasr/codegen/asr_to_wasm.cpp → ...libasr/src/libasr/codegen/asr_to_wasm.cpp
diff --git a/src/libasr/codegen/asr_to_wasm.h → src/libasr/src/libasr/codegen/asr_to_wasm.h b/src/libasr/codegen/asr_to_wasm.h → src/libasr/src/libasr/codegen/asr_to_wasm.h
diff --git a/src/libasr/codegen/asr_to_x86.cpp → src/libasr/src/libasr/codegen/asr_to_x86.cpp b/src/libasr/codegen/asr_to_x86.cpp → src/libasr/src/libasr/codegen/asr_to_x86.cpp
diff --git a/src/libasr/codegen/asr_to_x86.h → src/libasr/src/libasr/codegen/asr_to_x86.h b/src/libasr/codegen/asr_to_x86.h → src/libasr/src/libasr/codegen/asr_to_x86.h
diff --git a/src/libasr/codegen/c_utils.h → src/libasr/src/libasr/codegen/c_utils.h b/src/libasr/codegen/c_utils.h → src/libasr/src/libasr/codegen/c_utils.h
diff --git a/src/libasr/codegen/evaluator.cpp → src/libasr/src/libasr/codegen/evaluator.cpp b/src/libasr/codegen/evaluator.cpp → src/libasr/src/libasr/codegen/evaluator.cpp
diff --git a/src/libasr/codegen/evaluator.h → src/libasr/src/libasr/codegen/evaluator.h b/src/libasr/codegen/evaluator.h → src/libasr/src/libasr/codegen/evaluator.h
diff --git a/src/libasr/codegen/llvm_array_utils.cpp → ...r/src/libasr/codegen/llvm_array_utils.cpp b/src/libasr/codegen/llvm_array_utils.cpp → ...r/src/libasr/codegen/llvm_array_utils.cpp
diff --git a/src/libasr/codegen/llvm_array_utils.h → ...asr/src/libasr/codegen/llvm_array_utils.h b/src/libasr/codegen/llvm_array_utils.h → ...asr/src/libasr/codegen/llvm_array_utils.h
diff --git a/src/libasr/codegen/llvm_utils.cpp → src/libasr/src/libasr/codegen/llvm_utils.cpp b/src/libasr/codegen/llvm_utils.cpp → src/libasr/src/libasr/codegen/llvm_utils.cpp
diff --git a/src/libasr/codegen/llvm_utils.h → src/libasr/src/libasr/codegen/llvm_utils.h b/src/libasr/codegen/llvm_utils.h → src/libasr/src/libasr/codegen/llvm_utils.h
diff --git a/src/libasr/codegen/wasm_assembler.h → ...ibasr/src/libasr/codegen/wasm_assembler.h b/src/libasr/codegen/wasm_assembler.h → ...ibasr/src/libasr/codegen/wasm_assembler.h
diff --git a/src/libasr/codegen/wasm_decoder.h → src/libasr/src/libasr/codegen/wasm_decoder.h b/src/libasr/codegen/wasm_decoder.h → src/libasr/src/libasr/codegen/wasm_decoder.h
diff --git a/src/libasr/codegen/wasm_to_wat.cpp → ...libasr/src/libasr/codegen/wasm_to_wat.cpp b/src/libasr/codegen/wasm_to_wat.cpp → ...libasr/src/libasr/codegen/wasm_to_wat.cpp
diff --git a/src/libasr/codegen/wasm_to_wat.h → src/libasr/src/libasr/codegen/wasm_to_wat.h b/src/libasr/codegen/wasm_to_wat.h → src/libasr/src/libasr/codegen/wasm_to_wat.h
diff --git a/src/libasr/codegen/wasm_to_x64.cpp → ...libasr/src/libasr/codegen/wasm_to_x64.cpp b/src/libasr/codegen/wasm_to_x64.cpp → ...libasr/src/libasr/codegen/wasm_to_x64.cpp
diff --git a/src/libasr/codegen/wasm_to_x64.h → src/libasr/src/libasr/codegen/wasm_to_x64.h b/src/libasr/codegen/wasm_to_x64.h → src/libasr/src/libasr/codegen/wasm_to_x64.h
diff --git a/src/libasr/codegen/wasm_to_x86.cpp → ...libasr/src/libasr/codegen/wasm_to_x86.cpp b/src/libasr/codegen/wasm_to_x86.cpp → ...libasr/src/libasr/codegen/wasm_to_x86.cpp
diff --git a/src/libasr/codegen/wasm_to_x86.h → src/libasr/src/libasr/codegen/wasm_to_x86.h b/src/libasr/codegen/wasm_to_x86.h → src/libasr/src/libasr/codegen/wasm_to_x86.h
diff --git a/src/libasr/codegen/wasm_utils.cpp → src/libasr/src/libasr/codegen/wasm_utils.cpp b/src/libasr/codegen/wasm_utils.cpp → src/libasr/src/libasr/codegen/wasm_utils.cpp
diff --git a/src/libasr/codegen/wasm_utils.h → src/libasr/src/libasr/codegen/wasm_utils.h b/src/libasr/codegen/wasm_utils.h → src/libasr/src/libasr/codegen/wasm_utils.h
diff --git a/src/libasr/codegen/x86_assembler.cpp → ...basr/src/libasr/codegen/x86_assembler.cpp b/src/libasr/codegen/x86_assembler.cpp → ...basr/src/libasr/codegen/x86_assembler.cpp
diff --git a/src/libasr/codegen/x86_assembler.h → ...libasr/src/libasr/codegen/x86_assembler.h b/src/libasr/codegen/x86_assembler.h → ...libasr/src/libasr/codegen/x86_assembler.h
diff --git a/src/libasr/colors.h → src/libasr/src/libasr/colors.h b/src/libasr/colors.h → src/libasr/src/libasr/colors.h
diff --git a/src/libasr/compiler_tester/__init__.py → ...sr/src/libasr/compiler_tester/__init__.py b/src/libasr/compiler_tester/__init__.py → ...sr/src/libasr/compiler_tester/__init__.py
diff --git a/src/libasr/compiler_tester/tester.py → ...basr/src/libasr/compiler_tester/tester.py b/src/libasr/compiler_tester/tester.py → ...basr/src/libasr/compiler_tester/tester.py
@@ -25,6 +25,8 @@
 
 
 TESTER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__)))
+if "src/libasr/src/libasr" in TESTER_DIR:
+    TESTER_DIR = TESTER_DIR.replace("src/libasr", "", 1)
 LIBASR_DIR = os.path.dirname(TESTER_DIR)
 SRC_DIR = os.path.dirname(LIBASR_DIR)
 ROOT_DIR = os.path.dirname(SRC_DIR)

diff --git a/src/libasr/config.h.in → src/libasr/src/libasr/config.h.in b/src/libasr/config.h.in → src/libasr/src/libasr/config.h.in
diff --git a/src/libasr/containers.h → src/libasr/src/libasr/containers.h b/src/libasr/containers.h → src/libasr/src/libasr/containers.h
diff --git a/src/libasr/dat_convert.py → src/libasr/src/libasr/dat_convert.py b/src/libasr/dat_convert.py → src/libasr/src/libasr/dat_convert.py
diff --git a/src/libasr/diagnostics.cpp → src/libasr/src/libasr/diagnostics.cpp b/src/libasr/diagnostics.cpp → src/libasr/src/libasr/diagnostics.cpp
diff --git a/src/libasr/diagnostics.h → src/libasr/src/libasr/diagnostics.h b/src/libasr/diagnostics.h → src/libasr/src/libasr/diagnostics.h
diff --git a/src/libasr/dwarf_convert.py → src/libasr/src/libasr/dwarf_convert.py b/src/libasr/dwarf_convert.py → src/libasr/src/libasr/dwarf_convert.py
diff --git a/src/libasr/exception.h → src/libasr/src/libasr/exception.h b/src/libasr/exception.h → src/libasr/src/libasr/exception.h
diff --git a/src/libasr/gen_pass.py → src/libasr/src/libasr/gen_pass.py b/src/libasr/gen_pass.py → src/libasr/src/libasr/gen_pass.py
diff --git a/...ibasr/intrinsic_func_registry_util_gen.py → ...ibasr/intrinsic_func_registry_util_gen.py b/...ibasr/intrinsic_func_registry_util_gen.py → ...ibasr/intrinsic_func_registry_util_gen.py
diff --git a/src/libasr/location.h → src/libasr/src/libasr/location.h b/src/libasr/location.h → src/libasr/src/libasr/location.h
diff --git a/src/libasr/lsp_interface.h → src/libasr/src/libasr/lsp_interface.h b/src/libasr/lsp_interface.h → src/libasr/src/libasr/lsp_interface.h
diff --git a/src/libasr/modfile.cpp → src/libasr/src/libasr/modfile.cpp b/src/libasr/modfile.cpp → src/libasr/src/libasr/modfile.cpp
diff --git a/src/libasr/modfile.h → src/libasr/src/libasr/modfile.h b/src/libasr/modfile.h → src/libasr/src/libasr/modfile.h
diff --git a/src/libasr/pass/arr_slice.cpp → src/libasr/src/libasr/pass/arr_slice.cpp b/src/libasr/pass/arr_slice.cpp → src/libasr/src/libasr/pass/arr_slice.cpp
diff --git a/src/libasr/pass/array_by_data.h → src/libasr/src/libasr/pass/array_by_data.h b/src/libasr/pass/array_by_data.h → src/libasr/src/libasr/pass/array_by_data.h
diff --git a/src/libasr/pass/array_op.cpp → src/libasr/src/libasr/pass/array_op.cpp b/src/libasr/pass/array_op.cpp → src/libasr/src/libasr/pass/array_op.cpp
diff --git a/src/libasr/pass/class_constructor.cpp → ...asr/src/libasr/pass/class_constructor.cpp b/src/libasr/pass/class_constructor.cpp → ...asr/src/libasr/pass/class_constructor.cpp
diff --git a/src/libasr/pass/compare.h → src/libasr/src/libasr/pass/compare.h b/src/libasr/pass/compare.h → src/libasr/src/libasr/pass/compare.h
diff --git a/...sr/pass/create_subroutine_from_function.h → ...sr/pass/create_subroutine_from_function.h b/...sr/pass/create_subroutine_from_function.h → ...sr/pass/create_subroutine_from_function.h
diff --git a/src/libasr/pass/dead_code_removal.cpp → ...asr/src/libasr/pass/dead_code_removal.cpp b/src/libasr/pass/dead_code_removal.cpp → ...asr/src/libasr/pass/dead_code_removal.cpp
diff --git a/src/libasr/pass/dead_code_removal.h → ...ibasr/src/libasr/pass/dead_code_removal.h b/src/libasr/pass/dead_code_removal.h → ...ibasr/src/libasr/pass/dead_code_removal.h
diff --git a/src/libasr/pass/div_to_mul.cpp → src/libasr/src/libasr/pass/div_to_mul.cpp b/src/libasr/pass/div_to_mul.cpp → src/libasr/src/libasr/pass/div_to_mul.cpp
diff --git a/src/libasr/pass/do_loops.cpp → src/libasr/src/libasr/pass/do_loops.cpp b/src/libasr/pass/do_loops.cpp → src/libasr/src/libasr/pass/do_loops.cpp
diff --git a/src/libasr/pass/flip_sign.cpp → src/libasr/src/libasr/pass/flip_sign.cpp b/src/libasr/pass/flip_sign.cpp → src/libasr/src/libasr/pass/flip_sign.cpp
diff --git a/src/libasr/pass/fma.cpp → src/libasr/src/libasr/pass/fma.cpp b/src/libasr/pass/fma.cpp → src/libasr/src/libasr/pass/fma.cpp
diff --git a/src/libasr/pass/for_all.cpp → src/libasr/src/libasr/pass/for_all.cpp b/src/libasr/pass/for_all.cpp → src/libasr/src/libasr/pass/for_all.cpp
diff --git a/...asr/pass/function_call_in_declaration.cpp → ...asr/pass/function_call_in_declaration.cpp b/...asr/pass/function_call_in_declaration.cpp → ...asr/pass/function_call_in_declaration.cpp
diff --git a/src/libasr/pass/global_stmts.cpp → src/libasr/src/libasr/pass/global_stmts.cpp b/src/libasr/pass/global_stmts.cpp → src/libasr/src/libasr/pass/global_stmts.cpp
diff --git a/src/libasr/pass/implied_do_loops.cpp → ...basr/src/libasr/pass/implied_do_loops.cpp b/src/libasr/pass/implied_do_loops.cpp → ...basr/src/libasr/pass/implied_do_loops.cpp
diff --git a/src/libasr/pass/init_expr.cpp → src/libasr/src/libasr/pass/init_expr.cpp b/src/libasr/pass/init_expr.cpp → src/libasr/src/libasr/pass/init_expr.cpp
diff --git a/src/libasr/pass/inline_function_calls.cpp → ...src/libasr/pass/inline_function_calls.cpp b/src/libasr/pass/inline_function_calls.cpp → ...src/libasr/pass/inline_function_calls.cpp
diff --git a/src/libasr/pass/inline_function_calls.h → ...r/src/libasr/pass/inline_function_calls.h b/src/libasr/pass/inline_function_calls.h → ...r/src/libasr/pass/inline_function_calls.h
diff --git a/src/libasr/pass/insert_deallocate.cpp → ...asr/src/libasr/pass/insert_deallocate.cpp b/src/libasr/pass/insert_deallocate.cpp → ...asr/src/libasr/pass/insert_deallocate.cpp
diff --git a/src/libasr/pass/insert_deallocate.h → ...ibasr/src/libasr/pass/insert_deallocate.h b/src/libasr/pass/insert_deallocate.h → ...ibasr/src/libasr/pass/insert_deallocate.h
diff --git a/src/libasr/pass/instantiate_template.cpp → .../src/libasr/pass/instantiate_template.cpp b/src/libasr/pass/instantiate_template.cpp → .../src/libasr/pass/instantiate_template.cpp
diff --git a/src/libasr/pass/instantiate_template.h → ...sr/src/libasr/pass/instantiate_template.h b/src/libasr/pass/instantiate_template.h → ...sr/src/libasr/pass/instantiate_template.h
diff --git a/.../pass/intrinsic_array_function_registry.h → .../pass/intrinsic_array_function_registry.h b/.../pass/intrinsic_array_function_registry.h → .../pass/intrinsic_array_function_registry.h
diff --git a/src/libasr/pass/intrinsic_function.cpp → ...sr/src/libasr/pass/intrinsic_function.cpp b/src/libasr/pass/intrinsic_function.cpp → ...sr/src/libasr/pass/intrinsic_function.cpp
diff --git a/...libasr/pass/intrinsic_function_registry.h → ...libasr/pass/intrinsic_function_registry.h b/...libasr/pass/intrinsic_function_registry.h → ...libasr/pass/intrinsic_function_registry.h
diff --git a/src/libasr/pass/intrinsic_functions.h → ...asr/src/libasr/pass/intrinsic_functions.h b/src/libasr/pass/intrinsic_functions.h → ...asr/src/libasr/pass/intrinsic_functions.h
diff --git a/src/libasr/pass/intrinsic_subroutine.cpp → .../src/libasr/pass/intrinsic_subroutine.cpp b/src/libasr/pass/intrinsic_subroutine.cpp → .../src/libasr/pass/intrinsic_subroutine.cpp
diff --git a/...basr/pass/intrinsic_subroutine_registry.h → ...basr/pass/intrinsic_subroutine_registry.h b/...basr/pass/intrinsic_subroutine_registry.h → ...basr/pass/intrinsic_subroutine_registry.h
diff --git a/src/libasr/pass/intrinsic_subroutines.h → ...r/src/libasr/pass/intrinsic_subroutines.h b/src/libasr/pass/intrinsic_subroutines.h → ...r/src/libasr/pass/intrinsic_subroutines.h
diff --git a/src/libasr/pass/list_expr.h → src/libasr/src/libasr/pass/list_expr.h b/src/libasr/pass/list_expr.h → src/libasr/src/libasr/pass/list_expr.h
diff --git a/src/libasr/pass/loop_unroll.cpp → src/libasr/src/libasr/pass/loop_unroll.cpp b/src/libasr/pass/loop_unroll.cpp → src/libasr/src/libasr/pass/loop_unroll.cpp
diff --git a/src/libasr/pass/loop_unroll.h → src/libasr/src/libasr/pass/loop_unroll.h b/src/libasr/pass/loop_unroll.h → src/libasr/src/libasr/pass/loop_unroll.h
diff --git a/src/libasr/pass/loop_vectorise.cpp → ...libasr/src/libasr/pass/loop_vectorise.cpp b/src/libasr/pass/loop_vectorise.cpp → ...libasr/src/libasr/pass/loop_vectorise.cpp
diff --git a/src/libasr/pass/loop_vectorise.h → src/libasr/src/libasr/pass/loop_vectorise.h b/src/libasr/pass/loop_vectorise.h → src/libasr/src/libasr/pass/loop_vectorise.h
diff --git a/src/libasr/pass/nested_vars.cpp → src/libasr/src/libasr/pass/nested_vars.cpp b/src/libasr/pass/nested_vars.cpp → src/libasr/src/libasr/pass/nested_vars.cpp
diff --git a/src/libasr/pass/nested_vars.h → src/libasr/src/libasr/pass/nested_vars.h b/src/libasr/pass/nested_vars.h → src/libasr/src/libasr/pass/nested_vars.h
diff --git a/src/libasr/pass/param_to_const.cpp → ...libasr/src/libasr/pass/param_to_const.cpp b/src/libasr/pass/param_to_const.cpp → ...libasr/src/libasr/pass/param_to_const.cpp
diff --git a/src/libasr/pass/pass_array_by_data.cpp → ...sr/src/libasr/pass/pass_array_by_data.cpp b/src/libasr/pass/pass_array_by_data.cpp → ...sr/src/libasr/pass/pass_array_by_data.cpp
diff --git a/src/libasr/pass/pass_compare.cpp → src/libasr/src/libasr/pass/pass_compare.cpp b/src/libasr/pass/pass_compare.cpp → src/libasr/src/libasr/pass/pass_compare.cpp
diff --git a/src/libasr/pass/pass_list_expr.cpp → ...libasr/src/libasr/pass/pass_list_expr.cpp b/src/libasr/pass/pass_list_expr.cpp → ...libasr/src/libasr/pass/pass_list_expr.cpp
diff --git a/src/libasr/pass/pass_manager.h → src/libasr/src/libasr/pass/pass_manager.h b/src/libasr/pass/pass_manager.h → src/libasr/src/libasr/pass/pass_manager.h
diff --git a/src/libasr/pass/pass_utils.cpp → src/libasr/src/libasr/pass/pass_utils.cpp b/src/libasr/pass/pass_utils.cpp → src/libasr/src/libasr/pass/pass_utils.cpp
diff --git a/src/libasr/pass/pass_utils.h → src/libasr/src/libasr/pass/pass_utils.h b/src/libasr/pass/pass_utils.h → src/libasr/src/libasr/pass/pass_utils.h
diff --git a/src/libasr/pass/print_arr.cpp → src/libasr/src/libasr/pass/print_arr.cpp b/src/libasr/pass/print_arr.cpp → src/libasr/src/libasr/pass/print_arr.cpp
diff --git a/src/libasr/pass/print_list_tuple.cpp → ...basr/src/libasr/pass/print_list_tuple.cpp b/src/libasr/pass/print_list_tuple.cpp → ...basr/src/libasr/pass/print_list_tuple.cpp
diff --git a/src/libasr/pass/print_struct_type.cpp → ...asr/src/libasr/pass/print_struct_type.cpp b/src/libasr/pass/print_struct_type.cpp → ...asr/src/libasr/pass/print_struct_type.cpp
diff --git a/...promote_allocatable_to_nonallocatable.cpp → ...promote_allocatable_to_nonallocatable.cpp b/...promote_allocatable_to_nonallocatable.cpp → ...promote_allocatable_to_nonallocatable.cpp
diff --git a/...s/promote_allocatable_to_nonallocatable.h → ...s/promote_allocatable_to_nonallocatable.h b/...s/promote_allocatable_to_nonallocatable.h → ...s/promote_allocatable_to_nonallocatable.h
diff --git a/src/libasr/pass/python_bind.cpp → src/libasr/src/libasr/pass/python_bind.cpp b/src/libasr/pass/python_bind.cpp → src/libasr/src/libasr/pass/python_bind.cpp
diff --git a/src/libasr/pass/python_bind.h → src/libasr/src/libasr/pass/python_bind.h b/src/libasr/pass/python_bind.h → src/libasr/src/libasr/pass/python_bind.h
diff --git a/src/libasr/pass/replace_arr_slice.h → ...ibasr/src/libasr/pass/replace_arr_slice.h b/src/libasr/pass/replace_arr_slice.h → ...ibasr/src/libasr/pass/replace_arr_slice.h
diff --git a/src/libasr/pass/replace_array_op.h → ...libasr/src/libasr/pass/replace_array_op.h b/src/libasr/pass/replace_array_op.h → ...libasr/src/libasr/pass/replace_array_op.h
diff --git a/src/libasr/pass/replace_class_constructor.h → ...c/libasr/pass/replace_class_constructor.h b/src/libasr/pass/replace_class_constructor.h → ...c/libasr/pass/replace_class_constructor.h
diff --git a/src/libasr/pass/replace_div_to_mul.h → ...basr/src/libasr/pass/replace_div_to_mul.h b/src/libasr/pass/replace_div_to_mul.h → ...basr/src/libasr/pass/replace_div_to_mul.h
diff --git a/src/libasr/pass/replace_do_loops.h → ...libasr/src/libasr/pass/replace_do_loops.h b/src/libasr/pass/replace_do_loops.h → ...libasr/src/libasr/pass/replace_do_loops.h
diff --git a/src/libasr/pass/replace_flip_sign.h → ...ibasr/src/libasr/pass/replace_flip_sign.h b/src/libasr/pass/replace_flip_sign.h → ...ibasr/src/libasr/pass/replace_flip_sign.h
diff --git a/src/libasr/pass/replace_fma.h → src/libasr/src/libasr/pass/replace_fma.h b/src/libasr/pass/replace_fma.h → src/libasr/src/libasr/pass/replace_fma.h
diff --git a/src/libasr/pass/replace_for_all.h → src/libasr/src/libasr/pass/replace_for_all.h b/src/libasr/pass/replace_for_all.h → src/libasr/src/libasr/pass/replace_for_all.h
diff --git a/...ss/replace_function_call_in_declaration.h → ...ss/replace_function_call_in_declaration.h b/...ss/replace_function_call_in_declaration.h → ...ss/replace_function_call_in_declaration.h
diff --git a/src/libasr/pass/replace_implied_do_loops.h → ...rc/libasr/pass/replace_implied_do_loops.h b/src/libasr/pass/replace_implied_do_loops.h → ...rc/libasr/pass/replace_implied_do_loops.h
diff --git a/src/libasr/pass/replace_init_expr.h → ...ibasr/src/libasr/pass/replace_init_expr.h b/src/libasr/pass/replace_init_expr.h → ...ibasr/src/libasr/pass/replace_init_expr.h
diff --git a/src/libasr/pass/replace_intrinsic_function.h → .../libasr/pass/replace_intrinsic_function.h b/src/libasr/pass/replace_intrinsic_function.h → .../libasr/pass/replace_intrinsic_function.h
diff --git a/...ibasr/pass/replace_intrinsic_subroutine.h → ...ibasr/pass/replace_intrinsic_subroutine.h b/...ibasr/pass/replace_intrinsic_subroutine.h → ...ibasr/pass/replace_intrinsic_subroutine.h
diff --git a/src/libasr/pass/replace_param_to_const.h → .../src/libasr/pass/replace_param_to_const.h b/src/libasr/pass/replace_param_to_const.h → .../src/libasr/pass/replace_param_to_const.h
diff --git a/src/libasr/pass/replace_print_arr.h → ...ibasr/src/libasr/pass/replace_print_arr.h b/src/libasr/pass/replace_print_arr.h → ...ibasr/src/libasr/pass/replace_print_arr.h
diff --git a/src/libasr/pass/replace_print_list_tuple.h → ...rc/libasr/pass/replace_print_list_tuple.h b/src/libasr/pass/replace_print_list_tuple.h → ...rc/libasr/pass/replace_print_list_tuple.h
diff --git a/src/libasr/pass/replace_print_struct_type.h → ...c/libasr/pass/replace_print_struct_type.h b/src/libasr/pass/replace_print_struct_type.h → ...c/libasr/pass/replace_print_struct_type.h
diff --git a/src/libasr/pass/replace_select_case.h → ...asr/src/libasr/pass/replace_select_case.h b/src/libasr/pass/replace_select_case.h → ...asr/src/libasr/pass/replace_select_case.h
diff --git a/src/libasr/pass/replace_sign_from_value.h → ...src/libasr/pass/replace_sign_from_value.h b/src/libasr/pass/replace_sign_from_value.h → ...src/libasr/pass/replace_sign_from_value.h
diff --git a/src/libasr/pass/replace_symbolic.cpp → ...basr/src/libasr/pass/replace_symbolic.cpp b/src/libasr/pass/replace_symbolic.cpp → ...basr/src/libasr/pass/replace_symbolic.cpp
diff --git a/src/libasr/pass/replace_symbolic.h → ...libasr/src/libasr/pass/replace_symbolic.h b/src/libasr/pass/replace_symbolic.h → ...libasr/src/libasr/pass/replace_symbolic.h
diff --git a/src/libasr/pass/replace_where.h → src/libasr/src/libasr/pass/replace_where.h b/src/libasr/pass/replace_where.h → src/libasr/src/libasr/pass/replace_where.h
diff --git a/src/libasr/pass/select_case.cpp → src/libasr/src/libasr/pass/select_case.cpp b/src/libasr/pass/select_case.cpp → src/libasr/src/libasr/pass/select_case.cpp
diff --git a/src/libasr/pass/sign_from_value.cpp → ...ibasr/src/libasr/pass/sign_from_value.cpp b/src/libasr/pass/sign_from_value.cpp → ...ibasr/src/libasr/pass/sign_from_value.cpp
diff --git a/src/libasr/pass/stmt_walk_visitor.h → ...ibasr/src/libasr/pass/stmt_walk_visitor.h b/src/libasr/pass/stmt_walk_visitor.h → ...ibasr/src/libasr/pass/stmt_walk_visitor.h
diff --git a/src/libasr/pass/subroutine_from_function.cpp → .../libasr/pass/subroutine_from_function.cpp b/src/libasr/pass/subroutine_from_function.cpp → .../libasr/pass/subroutine_from_function.cpp
diff --git a/...transform_optional_argument_functions.cpp → ...transform_optional_argument_functions.cpp b/...transform_optional_argument_functions.cpp → ...transform_optional_argument_functions.cpp
diff --git a/...s/transform_optional_argument_functions.h → ...s/transform_optional_argument_functions.h b/...s/transform_optional_argument_functions.h → ...s/transform_optional_argument_functions.h
diff --git a/src/libasr/pass/unique_symbols.cpp → ...libasr/src/libasr/pass/unique_symbols.cpp b/src/libasr/pass/unique_symbols.cpp → ...libasr/src/libasr/pass/unique_symbols.cpp
diff --git a/src/libasr/pass/unique_symbols.h → src/libasr/src/libasr/pass/unique_symbols.h b/src/libasr/pass/unique_symbols.h → src/libasr/src/libasr/pass/unique_symbols.h
diff --git a/src/libasr/pass/unused_functions.cpp → ...basr/src/libasr/pass/unused_functions.cpp b/src/libasr/pass/unused_functions.cpp → ...basr/src/libasr/pass/unused_functions.cpp
diff --git a/src/libasr/pass/unused_functions.h → ...libasr/src/libasr/pass/unused_functions.h b/src/libasr/pass/unused_functions.h → ...libasr/src/libasr/pass/unused_functions.h
diff --git a/...pass/update_array_dim_intrinsic_calls.cpp → ...pass/update_array_dim_intrinsic_calls.cpp b/...pass/update_array_dim_intrinsic_calls.cpp → ...pass/update_array_dim_intrinsic_calls.cpp
diff --git a/...r/pass/update_array_dim_intrinsic_calls.h → ...r/pass/update_array_dim_intrinsic_calls.h b/...r/pass/update_array_dim_intrinsic_calls.h → ...r/pass/update_array_dim_intrinsic_calls.h
diff --git a/src/libasr/pass/where.cpp → src/libasr/src/libasr/pass/where.cpp b/src/libasr/pass/where.cpp → src/libasr/src/libasr/pass/where.cpp
diff --git a/src/libasr/pass/while_else.cpp → src/libasr/src/libasr/pass/while_else.cpp b/src/libasr/pass/while_else.cpp → src/libasr/src/libasr/pass/while_else.cpp
diff --git a/src/libasr/pass/while_else.h → src/libasr/src/libasr/pass/while_else.h b/src/libasr/pass/while_else.h → src/libasr/src/libasr/pass/while_else.h
diff --git a/src/libasr/pass/wrap_global_stmts.h → ...ibasr/src/libasr/pass/wrap_global_stmts.h b/src/libasr/pass/wrap_global_stmts.h → ...ibasr/src/libasr/pass/wrap_global_stmts.h
diff --git a/src/libasr/pickle.cpp → src/libasr/src/libasr/pickle.cpp b/src/libasr/pickle.cpp → src/libasr/src/libasr/pickle.cpp
diff --git a/src/libasr/pickle.h → src/libasr/src/libasr/pickle.h b/src/libasr/pickle.h → src/libasr/src/libasr/pickle.h
diff --git a/src/libasr/runtime/lfortran_intrinsics.c → .../src/libasr/runtime/lfortran_intrinsics.c b/src/libasr/runtime/lfortran_intrinsics.c → .../src/libasr/runtime/lfortran_intrinsics.c
diff --git a/src/libasr/runtime/lfortran_intrinsics.h → .../src/libasr/runtime/lfortran_intrinsics.h b/src/libasr/runtime/lfortran_intrinsics.h → .../src/libasr/runtime/lfortran_intrinsics.h
diff --git a/src/libasr/semantic_exception.h → src/libasr/src/libasr/semantic_exception.h b/src/libasr/semantic_exception.h → src/libasr/src/libasr/semantic_exception.h
diff --git a/src/libasr/serialization.cpp → src/libasr/src/libasr/serialization.cpp b/src/libasr/serialization.cpp → src/libasr/src/libasr/serialization.cpp
diff --git a/src/libasr/serialization.h → src/libasr/src/libasr/serialization.h b/src/libasr/serialization.h → src/libasr/src/libasr/serialization.h
diff --git a/src/libasr/stacktrace.cpp → src/libasr/src/libasr/stacktrace.cpp b/src/libasr/stacktrace.cpp → src/libasr/src/libasr/stacktrace.cpp
diff --git a/src/libasr/stacktrace.h → src/libasr/src/libasr/stacktrace.h b/src/libasr/stacktrace.h → src/libasr/src/libasr/stacktrace.h
diff --git a/src/libasr/string_utils.cpp → src/libasr/src/libasr/string_utils.cpp b/src/libasr/string_utils.cpp → src/libasr/src/libasr/string_utils.cpp
diff --git a/src/libasr/string_utils.h → src/libasr/src/libasr/string_utils.h b/src/libasr/string_utils.h → src/libasr/src/libasr/string_utils.h
diff --git a/src/libasr/utils.h → src/libasr/src/libasr/utils.h b/src/libasr/utils.h → src/libasr/src/libasr/utils.h
diff --git a/src/libasr/utils2.cpp → src/libasr/src/libasr/utils2.cpp b/src/libasr/utils2.cpp → src/libasr/src/libasr/utils2.cpp
diff --git a/src/libasr/wasm_instructions.txt → src/libasr/src/libasr/wasm_instructions.txt b/src/libasr/wasm_instructions.txt → src/libasr/src/libasr/wasm_instructions.txt
diff --git a/src/libasr/wasm_instructions_visitor.py → ...r/src/libasr/wasm_instructions_visitor.py b/src/libasr/wasm_instructions_visitor.py → ...r/src/libasr/wasm_instructions_visitor.py
diff --git a/src/lpython/utils.cpp b/src/lpython/utils.cpp
@@ -84,7 +84,7 @@ std::string get_runtime_library_header_dir()
     char *env_p = std::getenv("LFORTRAN_RUNTIME_LIBRARY_HEADER_DIR");
     if (env_p) return env_p;
 
-    // The header file is in src/libasr/runtime for development, but in impure
+    // The header file is in libasr/src/libasr/runtime for development, but in impure
     // in installed version
     std::string path;
     int dirname_length;
@@ -94,11 +94,11 @@ std::string get_runtime_library_header_dir()
         || endswith(dirname, "src\\bin")
         || endswith(dirname, "SRC\\BIN")) {
         // Development version
-        return dirname + "/../libasr/runtime";
+        return dirname + "/../libasr/src/libasr/runtime";
     } else if (endswith(dirname, "src/lpython/tests") ||
                endswith(to_lower(dirname), "src\\lpython\\tests")) {
         // CTest Tests
-        return dirname + "/../../libasr/runtime";
+        return dirname + "/../../libasr/src/libasr/runtime";
     } else {
         // Installed version
         return dirname + "/../share/lpython/lib/impure";

diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(SRC
-    ../../../src/libasr/runtime/lfortran_intrinsics.c
+    ../../../src/libasr/src/libasr/runtime/lfortran_intrinsics.c
 )
 add_library(lpython_runtime SHARED ${SRC})
-target_include_directories(lpython_runtime BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)
-target_include_directories(lpython_runtime BEFORE PUBLIC ${libasr_BINARY_DIR}/..)
+target_include_directories(lpython_runtime BEFORE PUBLIC ${libasr/src/libasr_SOURCE_DIR}/..)
+target_include_directories(lpython_runtime BEFORE PUBLIC ${libasr/src/libasr_BINARY_DIR}/..)
 set_target_properties(lpython_runtime PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>)
 add_library(lpython_runtime_static STATIC ${SRC})
-target_include_directories(lpython_runtime_static BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)
-target_include_directories(lpython_runtime_static BEFORE PUBLIC ${libasr_BINARY_DIR}/..)
+target_include_directories(lpython_runtime_static BEFORE PUBLIC ${libasr/src/libasr_SOURCE_DIR}/..)
+target_include_directories(lpython_runtime_static BEFORE PUBLIC ${libasr/src/libasr_BINARY_DIR}/..)
 set_target_properties(lpython_runtime_static PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>

diff --git a/src/runtime/lpython/lpython.py b/src/runtime/lpython/lpython.py
@@ -717,7 +717,7 @@ def get_rtlib_dir():
             get_python_version
         python_path = "-I" + get_python_inc() + " "
         numpy_path = "-I" + get_include() + " "
-        rt_path_01 = "-I" + get_rtlib_dir() + "/../libasr/runtime "
+        rt_path_01 = "-I" + get_rtlib_dir() + "/../libasr/src/libasr/runtime "
         rt_path_02 = "-L" + get_rtlib_dir() + " -Wl,-rpath," \
             + get_rtlib_dir() + " -llpython_runtime "
         python_lib = "-L" + get_python_lib() + "/../.." + f" -Wl,-rpath,{get_python_lib()+'/../..'}" + " -lpython" + \