From a0cbcdb2da9bb8383174691c0073bdbbba1c08be Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel@gmail.com>
Date: Wed, 19 Jan 2022 11:26:24 +0530
Subject: [PATCH] Rename lfortran folder to lpython

---
 .gitignore                                    | 70 +++++++++----------
 build0.sh                                     | 10 +--
 build1_win.sh                                 |  6 +-
 ci/build.xsh                                  | 12 ++--
 grammar/asdl_cpp.py                           |  2 +-
 src/CMakeLists.txt                            |  2 +-
 src/bin/CMakeLists.txt                        |  6 +-
 src/bin/cpptranslate.cpp                      | 10 +--
 src/bin/lfortran.cpp                          | 24 +++----
 src/bin/parse.cpp                             |  2 +-
 src/bin/parse2.cpp                            |  4 +-
 src/bin/parse3.cpp                            |  4 +-
 src/{lfortran => lpython}/CMakeLists.txt      |  0
 .../ast_serialization.cpp                     |  6 +-
 src/{lfortran => lpython}/ast_serialization.h |  2 +-
 src/{lfortran => lpython}/ast_to_json.cpp     |  2 +-
 src/{lfortran => lpython}/ast_to_json.h       |  2 +-
 src/{lfortran => lpython}/ast_to_openmp.cpp   |  2 +-
 src/{lfortran => lpython}/ast_to_openmp.h     |  2 +-
 src/{lfortran => lpython}/ast_to_src.cpp      |  4 +-
 src/{lfortran => lpython}/ast_to_src.h        |  2 +-
 src/{lfortran => lpython}/bigint.h            |  0
 src/{lfortran => lpython}/cwrapper.cpp        |  8 +--
 src/{lfortran => lpython}/cwrapper.h          |  0
 .../fortran_evaluator.cpp                     | 14 ++--
 src/{lfortran => lpython}/fortran_evaluator.h |  6 +-
 src/{lfortran => lpython}/fortran_kernel.cpp  |  8 +--
 src/{lfortran => lpython}/fortran_kernel.h    |  0
 src/{lfortran => lpython}/mod_to_asr.cpp      |  2 +-
 src/{lfortran => lpython}/mod_to_asr.h        |  0
 src/{lfortran => lpython}/parser/parser.cpp   |  6 +-
 src/{lfortran => lpython}/parser/parser.h     |  2 +-
 src/{lfortran => lpython}/parser/parser.yy    |  8 +--
 .../parser/parser_exception.h                 |  0
 .../parser/parser_stype.h                     |  4 +-
 .../parser/preprocessor.h                     |  4 +-
 .../parser/preprocessor.re                    |  4 +-
 src/{lfortran => lpython}/parser/semantics.h  |  4 +-
 src/{lfortran => lpython}/parser/tokenizer.h  |  2 +-
 src/{lfortran => lpython}/parser/tokenizer.re |  8 +--
 src/{lfortran => lpython}/pickle.cpp          |  8 +--
 src/{lfortran => lpython}/pickle.h            |  4 +-
 .../python_serialization.cpp                  |  2 +-
 .../python_serialization.h                    |  2 +-
 .../semantics/asr_implicit_cast_rules.h       |  4 +-
 .../semantics/ast_body_visitor.cpp            | 12 ++--
 .../semantics/ast_common_visitor.h            |  8 +--
 .../semantics/ast_symboltable_visitor.cpp     | 12 ++--
 .../semantics/ast_to_asr.cpp                  | 12 ++--
 .../semantics/ast_to_asr.h                    |  2 +-
 .../semantics/comptime_eval.h                 |  8 +--
 .../semantics/python_ast_to_asr.cpp           |  8 +--
 .../semantics/python_ast_to_asr.h             |  2 +-
 .../semantics/semantic_exception.h            |  0
 .../tests/CMakeLists.txt                      |  0
 src/{lfortran => lpython}/tests/test_asm.cpp  |  0
 src/{lfortran => lpython}/tests/test_ast.cpp  |  6 +-
 .../tests/test_ast_to_json.cpp                |  4 +-
 .../tests/test_cwrapper.c                     |  2 +-
 .../tests/test_error_rendering.cpp            |  2 +-
 src/{lfortran => lpython}/tests/test_llvm.cpp | 10 +--
 .../tests/test_parse.cpp                      |  6 +-
 .../tests/test_pickle.cpp                     |  6 +-
 .../tests/test_serialization.cpp              |  8 +--
 .../tests/test_stacktrace.cpp                 |  0
 .../tests/test_stacktrace2.cpp                |  6 +-
 src/{lfortran => lpython}/utils.cpp           |  8 +--
 src/{lfortran => lpython}/utils.h             |  0
 src/runtime/legacy/CMakeLists.txt             |  4 +-
 69 files changed, 200 insertions(+), 200 deletions(-)
 rename src/{lfortran => lpython}/CMakeLists.txt (100%)
 rename src/{lfortran => lpython}/ast_serialization.cpp (93%)
 rename src/{lfortran => lpython}/ast_serialization.h (92%)
 rename src/{lfortran => lpython}/ast_to_json.cpp (98%)
 rename src/{lfortran => lpython}/ast_to_json.h (87%)
 rename src/{lfortran => lpython}/ast_to_openmp.cpp (99%)
 rename src/{lfortran => lpython}/ast_to_openmp.h (90%)
 rename src/{lfortran => lpython}/ast_to_src.cpp (99%)
 rename src/{lfortran => lpython}/ast_to_src.h (91%)
 rename src/{lfortran => lpython}/bigint.h (100%)
 rename src/{lfortran => lpython}/cwrapper.cpp (94%)
 rename src/{lfortran => lpython}/cwrapper.h (100%)
 rename src/{lfortran => lpython}/fortran_evaluator.cpp (97%)
 rename src/{lfortran => lpython}/fortran_evaluator.h (97%)
 rename src/{lfortran => lpython}/fortran_kernel.cpp (99%)
 rename src/{lfortran => lpython}/fortran_kernel.h (100%)
 rename src/{lfortran => lpython}/mod_to_asr.cpp (99%)
 rename src/{lfortran => lpython}/mod_to_asr.h (100%)
 rename src/{lfortran => lpython}/parser/parser.cpp (99%)
 rename src/{lfortran => lpython}/parser/parser.h (96%)
 rename src/{lfortran => lpython}/parser/parser.yy (99%)
 rename src/{lfortran => lpython}/parser/parser_exception.h (100%)
 rename src/{lfortran => lpython}/parser/parser_stype.h (97%)
 rename src/{lfortran => lpython}/parser/preprocessor.h (95%)
 rename src/{lfortran => lpython}/parser/preprocessor.re (99%)
 rename src/{lfortran => lpython}/parser/semantics.h (99%)
 rename src/{lfortran => lpython}/parser/tokenizer.h (97%)
 rename src/{lfortran => lpython}/parser/tokenizer.re (99%)
 rename src/{lfortran => lpython}/pickle.cpp (98%)
 rename src/{lfortran => lpython}/pickle.h (91%)
 rename src/{lfortran => lpython}/python_serialization.cpp (95%)
 rename src/{lfortran => lpython}/python_serialization.h (88%)
 rename src/{lfortran => lpython}/semantics/asr_implicit_cast_rules.h (99%)
 rename src/{lfortran => lpython}/semantics/ast_body_visitor.cpp (99%)
 rename src/{lfortran => lpython}/semantics/ast_common_visitor.h (99%)
 rename src/{lfortran => lpython}/semantics/ast_symboltable_visitor.cpp (99%)
 rename src/{lfortran => lpython}/semantics/ast_to_asr.cpp (84%)
 rename src/{lfortran => lpython}/semantics/ast_to_asr.h (93%)
 rename src/{lfortran => lpython}/semantics/comptime_eval.h (99%)
 rename src/{lfortran => lpython}/semantics/python_ast_to_asr.cpp (99%)
 rename src/{lfortran => lpython}/semantics/python_ast_to_asr.h (92%)
 rename src/{lfortran => lpython}/semantics/semantic_exception.h (100%)
 rename src/{lfortran => lpython}/tests/CMakeLists.txt (100%)
 rename src/{lfortran => lpython}/tests/test_asm.cpp (100%)
 rename src/{lfortran => lpython}/tests/test_ast.cpp (92%)
 rename src/{lfortran => lpython}/tests/test_ast_to_json.cpp (96%)
 rename src/{lfortran => lpython}/tests/test_cwrapper.c (95%)
 rename src/{lfortran => lpython}/tests/test_error_rendering.cpp (99%)
 rename src/{lfortran => lpython}/tests/test_llvm.cpp (99%)
 rename src/{lfortran => lpython}/tests/test_parse.cpp (99%)
 rename src/{lfortran => lpython}/tests/test_pickle.cpp (98%)
 rename src/{lfortran => lpython}/tests/test_serialization.cpp (98%)
 rename src/{lfortran => lpython}/tests/test_stacktrace.cpp (100%)
 rename src/{lfortran => lpython}/tests/test_stacktrace2.cpp (94%)
 rename src/{lfortran => lpython}/utils.cpp (88%)
 rename src/{lfortran => lpython}/utils.h (100%)

diff --git a/.gitignore b/.gitignore
index bc4f0ef9e6..bf36c65244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,27 +4,27 @@ src/bin/lpython
 src/bin/cpptranslate
 src/bin/parse
 src/bin/parse2
-src/lfortran/parser/parser.output
+src/lpython/parser/parser.output
 tests/output
-src/lfortran/tests/test_asm
-src/lfortran/tests/test_ast
-src/lfortran/tests/test_llvm
-src/lfortran/tests/test_parse
-src/lfortran/tests/test_pickle
-src/lfortran/tests/test_stacktrace*
-src/lfortran/tests/test_serialization*
-src/lfortran/tests/test_cwrapper
-src/lfortran/tests/test_serialization
-src/lfortran/tests/test_lfortran
-src/lfortran/tests/write32
-src/lfortran/tests/write32.asm
-src/lfortran/tests/subroutines32
-src/lfortran/tests/subroutines_args32
-src/lfortran/tests/print32
-src/lfortran/tests/print_integer
-src/lfortran/tests/cmp32
-src/lfortran/tests/x
-src/lfortran/tests/ref_pickle.txt.new
+src/lpython/tests/test_asm
+src/lpython/tests/test_ast
+src/lpython/tests/test_llvm
+src/lpython/tests/test_parse
+src/lpython/tests/test_pickle
+src/lpython/tests/test_stacktrace
+src/lpython/tests/test_serialization
+src/lpython/tests/test_cwrapper
+src/lpython/tests/test_serialization
+src/lpython/tests/test_lfortran
+src/lpython/tests/write32
+src/lpython/tests/write32.asm
+src/lpython/tests/subroutines32
+src/lpython/tests/subroutines_args32
+src/lpython/tests/print32
+src/lpython/tests/print_integer
+src/lpython/tests/cmp32
+src/lpython/tests/x
+src/lpython/tests/ref_pickle.txt.new
 
 # fortran_parser
 
@@ -54,21 +54,21 @@ _CPack_Packages
 
 ## Generated files
 version
-lfortran/ast/ast.py
-lfortran/asr/asr.py
-lfortran/parser/fortran.tokens
-lfortran/parser/fortran.interp
-lfortran/parser/fortranLexer.py
-lfortran/parser/fortranLexer.tokens
-lfortran/parser/fortranLexer.interp
-lfortran/parser/fortranParser.py
-lfortran/parser/fortranVisitor.py
-src/lfortran/parser/parser.tab.cc
-src/lfortran/parser/parser.tab.hh
-src/lfortran/parser/tokenizer.cpp
-src/lfortran/parser/preprocessor.cpp
-src/lfortran/ast.h
-src/lfortran/asr.h
+lpython/ast/ast.py
+lpython/asr/asr.py
+lpython/parser/fortran.tokens
+lpython/parser/fortran.interp
+lpython/parser/fortranLexer.py
+lpython/parser/fortranLexer.tokens
+lpython/parser/fortranLexer.interp
+lpython/parser/fortranParser.py
+lpython/parser/fortranVisitor.py
+src/lpython/parser/parser.tab.cc
+src/lpython/parser/parser.tab.hh
+src/lpython/parser/tokenizer.cpp
+src/lpython/parser/preprocessor.cpp
+src/lpython/ast.h
+src/lpython/asr.h
 src/libasr/asr.h
 src/libasr/config.h
 share/jupyter/kernels/fortran/kernel.json
diff --git a/build0.sh b/build0.sh
index ef421a9d6e..029e33b52c 100755
--- a/build0.sh
+++ b/build0.sh
@@ -11,14 +11,14 @@ python grammar/asdl_cpp.py
 # Generate a Python AST from Python.asdl (Python)
 python grammar/asdl_py.py
 # Generate a Python AST from Python.asdl (C++)
-python grammar/asdl_cpp.py grammar/Python.asdl src/lfortran/python_ast.h
+python grammar/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
 # Generate a Fortran ASR from ASR.asdl (C++)
 python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
 
 # Generate the tokenizer and parser
-(cd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp)
-(cd src/lfortran/parser && re2c -W -b preprocessor.re -o preprocessor.cpp)
-(cd src/lfortran/parser && bison -Wall -d -r all parser.yy)
+(cd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp)
+(cd src/lpython/parser && re2c -W -b preprocessor.re -o preprocessor.cpp)
+(cd src/lpython/parser && bison -Wall -d -r all parser.yy)
 
-grep -n "'" src/lfortran/parser/parser.yy && echo "Single quote not allowed" && exit 1
+grep -n "'" src/lpython/parser/parser.yy && echo "Single quote not allowed" && exit 1
 echo "OK"
diff --git a/build1_win.sh b/build1_win.sh
index 56a7e56b8f..0afda892bf 100644
--- a/build1_win.sh
+++ b/build1_win.sh
@@ -3,6 +3,6 @@
 bash ci/version.sh
 python grammar/asdl_cpp.py
 python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
-pushd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd
-pushd src/lfortran/parser && re2c -W -b preprocessor.re -o preprocessor.cpp && popd
-pushd src/lfortran/parser && bison -Wall -d -r all parser.yy && popd
\ No newline at end of file
+pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd
+pushd src/lpython/parser && re2c -W -b preprocessor.re -o preprocessor.cpp && popd
+pushd src/lpython/parser && bison -Wall -d -r all parser.yy && popd
diff --git a/ci/build.xsh b/ci/build.xsh
index e734427bac..71fe0d168c 100755
--- a/ci/build.xsh
+++ b/ci/build.xsh
@@ -31,14 +31,14 @@ python grammar/asdl_cpp.py
 # Generate a Fortran ASR from ASR.asdl (C++)
 python grammar/asdl_cpp.py grammar/ASR.asdl src/libasr/asr.h
 # Generate a Python AST from Python.asdl (C++)
-python grammar/asdl_cpp.py grammar/Python.asdl src/lfortran/python_ast.h
+python grammar/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 the tokenizer and parser
-pushd src/lfortran/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd
-pushd src/lfortran/parser && re2c -W -b preprocessor.re -o preprocessor.cpp && popd
-pushd src/lfortran/parser && bison -Wall -d -r all parser.yy && popd
+pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd
+pushd src/lpython/parser && re2c -W -b preprocessor.re -o preprocessor.cpp && popd
+pushd src/lpython/parser && bison -Wall -d -r all parser.yy && popd
 
 $lpython_version=$(cat version).strip()
 $dest="lpython-" + $lpython_version
@@ -54,7 +54,7 @@ cd test-bld
 BUILD_TYPE = "Release"
 cmake -G $LFORTRAN_CMAKE_GENERATOR -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_LLVM=yes -DWITH_XEUS=yes -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DWITH_LFORTRAN_BINARY_MODFILES=no -DCMAKE_BUILD_TYPE=@(BUILD_TYPE) ..
 cmake --build . --target install
-./src/lfortran/tests/test_lfortran
+./src/lpython/tests/test_lfortran
 ./src/bin/lpython < ../src/bin/example_input.txt
 ctest --output-on-failure
 cpack -V
@@ -63,7 +63,7 @@ cd ../..
 jupyter kernelspec list --json
 #python ci/test_fortran_kernel.py -v
 #
-cd share/lfortran/nb
+cd share/lpython/nb
 jupyter nbconvert --to notebook --execute --ExecutePreprocessor.timeout=60 --output Demo1_out.ipynb Demo1.ipynb
 jupyter nbconvert --to notebook --execute --ExecutePreprocessor.timeout=60 --output Demo2_out.ipynb Demo2.ipynb
 cat Demo1_out.ipynb
diff --git a/grammar/asdl_cpp.py b/grammar/asdl_cpp.py
index b6ff01f673..e78c726274 100644
--- a/grammar/asdl_cpp.py
+++ b/grammar/asdl_cpp.py
@@ -1276,7 +1276,7 @@ def main(argv):
         print("Assuming default values of AST.asdl and ast.h")
         here = os.path.dirname(__file__)
         def_file = os.path.join(here, "AST.asdl")
-        out_file = os.path.join(here, "..", "src", "lfortran", "ast.h")
+        out_file = os.path.join(here, "..", "src", "lpython", "ast.h")
     else:
         print("invalid arguments")
         return 2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 032063b265..061b942762 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(libasr)
 add_subdirectory(tests)
-add_subdirectory(lfortran)
+add_subdirectory(lpython)
 add_subdirectory(bin)
 add_subdirectory(runtime/legacy)
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index a0e2b3cad1..514580c389 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -113,7 +113,7 @@ if (WITH_RUNTIME_LIBRARY)
               ${CMAKE_CURRENT_BINARY_DIR}/../runtime/lfortran_intrinsic_sin.mod
               ${CMAKE_CURRENT_BINARY_DIR}/../runtime/lfortran_intrinsic_string.mod
               ${CMAKE_CURRENT_BINARY_DIR}/../runtime/lfortran_intrinsic_bit.mod
-        DESTINATION share/lfortran/lib
+        DESTINATION share/lpython/lib
     )
 endif()
 
@@ -127,8 +127,8 @@ set_target_properties(lpython PROPERTIES
 
 install(TARGETS lpython
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION share/lfortran/lib
-    LIBRARY DESTINATION share/lfortran/lib
+    ARCHIVE DESTINATION share/lpython/lib
+    LIBRARY DESTINATION share/lpython/lib
 )
 
 
diff --git a/src/bin/cpptranslate.cpp b/src/bin/cpptranslate.cpp
index 069eb2b6d6..d9e64e2e42 100644
--- a/src/bin/cpptranslate.cpp
+++ b/src/bin/cpptranslate.cpp
@@ -4,11 +4,11 @@
 #define CLI11_HAS_FILESYSTEM 0
 #include <bin/CLI11.hpp>
 
-#include <lfortran/parser/parser.h>
-#include <lfortran/pickle.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/ast_to_src.h>
-#include <lfortran/ast_to_openmp.h>
+#include <lpython/parser/parser.h>
+#include <lpython/pickle.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/ast_to_src.h>
+#include <lpython/ast_to_openmp.h>
 #include <libasr/config.h>
 
 std::string read_file(const std::string &filename)
diff --git a/src/bin/lfortran.cpp b/src/bin/lfortran.cpp
index 338fdd8826..93bb0c5e25 100644
--- a/src/bin/lfortran.cpp
+++ b/src/bin/lfortran.cpp
@@ -7,18 +7,18 @@
 #include <bin/CLI11.hpp>
 
 #include <libasr/stacktrace.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/preprocessor.h>
-#include <lfortran/pickle.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/semantics/python_ast_to_asr.h>
-#include <lfortran/mod_to_asr.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/preprocessor.h>
+#include <lpython/pickle.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/semantics/python_ast_to_asr.h>
+#include <lpython/mod_to_asr.h>
 #include <libasr/codegen/asr_to_llvm.h>
 #include <libasr/codegen/asr_to_cpp.h>
 #include <libasr/codegen/asr_to_py.h>
 #include <libasr/codegen/asr_to_x86.h>
-#include <lfortran/ast_to_src.h>
-#include <lfortran/fortran_evaluator.h>
+#include <lpython/ast_to_src.h>
+#include <lpython/fortran_evaluator.h>
 #include <libasr/codegen/evaluator.h>
 #include <libasr/pass/do_loops.h>
 #include <libasr/pass/for_all.h>
@@ -33,11 +33,11 @@
 #include <libasr/asr_verify.h>
 #include <libasr/modfile.h>
 #include <libasr/config.h>
-#include <lfortran/fortran_kernel.h>
+#include <lpython/fortran_kernel.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
-#include <lfortran/python_serialization.h>
-#include <lfortran/parser/parser.tab.hh>
+#include <lpython/utils.h>
+#include <lpython/python_serialization.h>
+#include <lpython/parser/parser.tab.hh>
 
 #include <cpp-terminal/terminal.h>
 #include <cpp-terminal/prompt0.h>
diff --git a/src/bin/parse.cpp b/src/bin/parse.cpp
index effad52b97..fd9e876f28 100644
--- a/src/bin/parse.cpp
+++ b/src/bin/parse.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <chrono>
-#include <lfortran/parser/parser.h>
+#include <lpython/parser/parser.h>
 
 using LFortran::parse;
 using LFortran::AST::ast_t;
diff --git a/src/bin/parse2.cpp b/src/bin/parse2.cpp
index 3ee2d3f50e..49687971f9 100644
--- a/src/bin/parse2.cpp
+++ b/src/bin/parse2.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <fstream>
 #include <chrono>
-#include <lfortran/parser/parser.h>
-#include <lfortran/pickle.h>
+#include <lpython/parser/parser.h>
+#include <lpython/pickle.h>
 
 int main()
 {
diff --git a/src/bin/parse3.cpp b/src/bin/parse3.cpp
index 1582bccc36..4671cd859c 100644
--- a/src/bin/parse3.cpp
+++ b/src/bin/parse3.cpp
@@ -4,8 +4,8 @@
 
 #include <fmt/core.h>
 
-#include <lfortran/parser/parser.h>
-#include <lfortran/pickle.h>
+#include <lpython/parser/parser.h>
+#include <lpython/pickle.h>
 
 std::string construct_fortran(size_t N) {
     std::string sub_template = R"(
diff --git a/src/lfortran/CMakeLists.txt b/src/lpython/CMakeLists.txt
similarity index 100%
rename from src/lfortran/CMakeLists.txt
rename to src/lpython/CMakeLists.txt
diff --git a/src/lfortran/ast_serialization.cpp b/src/lpython/ast_serialization.cpp
similarity index 93%
rename from src/lfortran/ast_serialization.cpp
rename to src/lpython/ast_serialization.cpp
index f00136a091..4d14bf3ce3 100644
--- a/src/lfortran/ast_serialization.cpp
+++ b/src/lpython/ast_serialization.cpp
@@ -1,9 +1,9 @@
 #include <string>
 
 #include <libasr/config.h>
-#include <lfortran/ast_serialization.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/parser.tab.hh>
+#include <lpython/ast_serialization.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/parser.tab.hh>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
 #include <libasr/bwriter.h>
diff --git a/src/lfortran/ast_serialization.h b/src/lpython/ast_serialization.h
similarity index 92%
rename from src/lfortran/ast_serialization.h
rename to src/lpython/ast_serialization.h
index e704aeac59..8c5a13ed05 100644
--- a/src/lfortran/ast_serialization.h
+++ b/src/lpython/ast_serialization.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_SERIALIZATION_H
 #define LFORTRAN_SERIALIZATION_H
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 
 namespace LFortran {
diff --git a/src/lfortran/ast_to_json.cpp b/src/lpython/ast_to_json.cpp
similarity index 98%
rename from src/lfortran/ast_to_json.cpp
rename to src/lpython/ast_to_json.cpp
index faf6bb4db3..dac761eafb 100644
--- a/src/lfortran/ast_to_json.cpp
+++ b/src/lpython/ast_to_json.cpp
@@ -3,7 +3,7 @@
 #include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
 
-#include <lfortran/ast_to_json.h>
+#include <lpython/ast_to_json.h>
 
 using LFortran::AST::expr_t;
 using LFortran::AST::Name_t;
diff --git a/src/lfortran/ast_to_json.h b/src/lpython/ast_to_json.h
similarity index 87%
rename from src/lfortran/ast_to_json.h
rename to src/lpython/ast_to_json.h
index 27b2ccd068..922a6d5dc4 100644
--- a/src/lfortran/ast_to_json.h
+++ b/src/lpython/ast_to_json.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_AST_TO_JSON_H
 #define LFORTRAN_AST_TO_JSON_H
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/ast_to_openmp.cpp b/src/lpython/ast_to_openmp.cpp
similarity index 99%
rename from src/lfortran/ast_to_openmp.cpp
rename to src/lpython/ast_to_openmp.cpp
index d0d54bdc4d..ad17959cfa 100644
--- a/src/lfortran/ast_to_openmp.cpp
+++ b/src/lpython/ast_to_openmp.cpp
@@ -1,6 +1,6 @@
 #include <cctype>
 
-#include <lfortran/ast_to_openmp.h>
+#include <lpython/ast_to_openmp.h>
 
 using LFortran::AST::expr_t;
 using LFortran::AST::Name_t;
diff --git a/src/lfortran/ast_to_openmp.h b/src/lpython/ast_to_openmp.h
similarity index 90%
rename from src/lfortran/ast_to_openmp.h
rename to src/lpython/ast_to_openmp.h
index 909394d121..01ab2f96fb 100644
--- a/src/lfortran/ast_to_openmp.h
+++ b/src/lpython/ast_to_openmp.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_AST_TO_OPENMP_H
 #define LFORTRAN_AST_TO_OPENMP_H
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/ast_to_src.cpp b/src/lpython/ast_to_src.cpp
similarity index 99%
rename from src/lfortran/ast_to_src.cpp
rename to src/lpython/ast_to_src.cpp
index ed7cab5ca8..223b5274a5 100644
--- a/src/lfortran/ast_to_src.cpp
+++ b/src/lpython/ast_to_src.cpp
@@ -1,7 +1,7 @@
 #include <cctype>
-#include <lfortran/ast_to_src.h>
+#include <lpython/ast_to_src.h>
 #include <libasr/string_utils.h>
-#include <lfortran/bigint.h>
+#include <lpython/bigint.h>
 
 using LFortran::AST::expr_t;
 using LFortran::AST::Name_t;
diff --git a/src/lfortran/ast_to_src.h b/src/lpython/ast_to_src.h
similarity index 91%
rename from src/lfortran/ast_to_src.h
rename to src/lpython/ast_to_src.h
index a4e6205e86..c687e692a5 100644
--- a/src/lfortran/ast_to_src.h
+++ b/src/lpython/ast_to_src.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_AST_TO_SRC_H
 #define LFORTRAN_AST_TO_SRC_H
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/bigint.h b/src/lpython/bigint.h
similarity index 100%
rename from src/lfortran/bigint.h
rename to src/lpython/bigint.h
diff --git a/src/lfortran/cwrapper.cpp b/src/lpython/cwrapper.cpp
similarity index 94%
rename from src/lfortran/cwrapper.cpp
rename to src/lpython/cwrapper.cpp
index 02984f0e8a..57eedcc866 100644
--- a/src/lfortran/cwrapper.cpp
+++ b/src/lpython/cwrapper.cpp
@@ -1,11 +1,11 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <lfortran/cwrapper.h>
-#include <lfortran/ast.h>
+#include <lpython/cwrapper.h>
+#include <lpython/ast.h>
 #include <libasr/alloc.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/pickle.h>
+#include <lpython/parser/parser.h>
+#include <lpython/pickle.h>
 
 
 extern "C" {
diff --git a/src/lfortran/cwrapper.h b/src/lpython/cwrapper.h
similarity index 100%
rename from src/lfortran/cwrapper.h
rename to src/lpython/cwrapper.h
diff --git a/src/lfortran/fortran_evaluator.cpp b/src/lpython/fortran_evaluator.cpp
similarity index 97%
rename from src/lfortran/fortran_evaluator.cpp
rename to src/lpython/fortran_evaluator.cpp
index 58c4dc75a6..22ff7dc025 100644
--- a/src/lfortran/fortran_evaluator.cpp
+++ b/src/lpython/fortran_evaluator.cpp
@@ -1,16 +1,16 @@
 #include <iostream>
 #include <fstream>
 
-#include <lfortran/fortran_evaluator.h>
+#include <lpython/fortran_evaluator.h>
 #include <libasr/codegen/asr_to_cpp.h>
-#include <lfortran/ast_to_src.h>
+#include <lpython/ast_to_src.h>
 #include <libasr/exception.h>
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/preprocessor.h>
-#include <lfortran/pickle.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/preprocessor.h>
+#include <lpython/pickle.h>
 
 #ifdef HAVE_LFORTRAN_LLVM
 #include <libasr/codegen/evaluator.h>
diff --git a/src/lfortran/fortran_evaluator.h b/src/lpython/fortran_evaluator.h
similarity index 97%
rename from src/lfortran/fortran_evaluator.h
rename to src/lpython/fortran_evaluator.h
index 0506ccb818..8357e6fc26 100644
--- a/src/lfortran/fortran_evaluator.h
+++ b/src/lpython/fortran_evaluator.h
@@ -5,11 +5,11 @@
 #include <memory>
 
 #include <libasr/alloc.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/parser/parser.h>
 #include <libasr/asr_scopes.h>
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 #include <libasr/config.h>
 #include <libasr/diagnostics.h>
 
diff --git a/src/lfortran/fortran_kernel.cpp b/src/lpython/fortran_kernel.cpp
similarity index 99%
rename from src/lfortran/fortran_kernel.cpp
rename to src/lpython/fortran_kernel.cpp
index ba7363bc55..03a7eb91f0 100644
--- a/src/lfortran/fortran_kernel.cpp
+++ b/src/lpython/fortran_kernel.cpp
@@ -19,11 +19,11 @@
 #include <xeus/xkernel_configuration.hpp>
 #include <nlohmann/json.hpp>
 
-#include <lfortran/fortran_kernel.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/semantics/ast_to_asr.h>
+#include <lpython/fortran_kernel.h>
+#include <lpython/parser/parser.h>
+#include <lpython/semantics/ast_to_asr.h>
 #include <libasr/codegen/asr_to_llvm.h>
-#include <lfortran/fortran_evaluator.h>
+#include <lpython/fortran_evaluator.h>
 #include <libasr/asr_utils.h>
 #include <libasr/string_utils.h>
 
diff --git a/src/lfortran/fortran_kernel.h b/src/lpython/fortran_kernel.h
similarity index 100%
rename from src/lfortran/fortran_kernel.h
rename to src/lpython/fortran_kernel.h
diff --git a/src/lfortran/mod_to_asr.cpp b/src/lpython/mod_to_asr.cpp
similarity index 99%
rename from src/lfortran/mod_to_asr.cpp
rename to src/lpython/mod_to_asr.cpp
index e6e6150395..a43451fb10 100644
--- a/src/lfortran/mod_to_asr.cpp
+++ b/src/lpython/mod_to_asr.cpp
@@ -10,7 +10,7 @@
 #include <libasr/asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
-#include <lfortran/mod_to_asr.h>
+#include <lpython/mod_to_asr.h>
 #include <libasr/string_utils.h>
 #include <libasr/containers.h>
 
diff --git a/src/lfortran/mod_to_asr.h b/src/lpython/mod_to_asr.h
similarity index 100%
rename from src/lfortran/mod_to_asr.h
rename to src/lpython/mod_to_asr.h
diff --git a/src/lfortran/parser/parser.cpp b/src/lpython/parser/parser.cpp
similarity index 99%
rename from src/lfortran/parser/parser.cpp
rename to src/lpython/parser/parser.cpp
index 05002a2be8..16dd0fc96d 100644
--- a/src/lfortran/parser/parser.cpp
+++ b/src/lpython/parser/parser.cpp
@@ -2,10 +2,10 @@
 #include <string>
 #include <sstream>
 
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/parser.tab.hh>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/parser.tab.hh>
 #include <libasr/diagnostics.h>
-#include <lfortran/parser/parser_exception.h>
+#include <lpython/parser/parser_exception.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/parser/parser.h b/src/lpython/parser/parser.h
similarity index 96%
rename from src/lfortran/parser/parser.h
rename to src/lpython/parser/parser.h
index 1b698bc4e9..b8117322fb 100644
--- a/src/lfortran/parser/parser.h
+++ b/src/lpython/parser/parser.h
@@ -7,7 +7,7 @@
 
 #include <libasr/containers.h>
 #include <libasr/diagnostics.h>
-#include <lfortran/parser/tokenizer.h>
+#include <lpython/parser/tokenizer.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/parser/parser.yy b/src/lpython/parser/parser.yy
similarity index 99%
rename from src/lfortran/parser/parser.yy
rename to src/lpython/parser/parser.yy
index 1fdfd88afb..c160c96fbf 100644
--- a/src/lfortran/parser/parser.yy
+++ b/src/lpython/parser/parser.yy
@@ -23,15 +23,15 @@
 
 %code requires // *.h
 {
-#include <lfortran/parser/parser.h>
+#include <lpython/parser/parser.h>
 }
 
 %code // *.cpp
 {
 
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/tokenizer.h>
-#include <lfortran/parser/semantics.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/tokenizer.h>
+#include <lpython/parser/semantics.h>
 
 int yylex(LFortran::YYSTYPE *yylval, YYLTYPE *yyloc, LFortran::Parser &p)
 {
diff --git a/src/lfortran/parser/parser_exception.h b/src/lpython/parser/parser_exception.h
similarity index 100%
rename from src/lfortran/parser/parser_exception.h
rename to src/lpython/parser/parser_exception.h
diff --git a/src/lfortran/parser/parser_stype.h b/src/lpython/parser/parser_stype.h
similarity index 97%
rename from src/lfortran/parser/parser_stype.h
rename to src/lpython/parser/parser_stype.h
index 87ee214f8c..2491727c47 100644
--- a/src/lfortran/parser/parser_stype.h
+++ b/src/lpython/parser/parser_stype.h
@@ -2,10 +2,10 @@
 #define LFORTRAN_PARSER_STYPE_H
 
 #include <cstring>
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/location.h>
 #include <libasr/containers.h>
-#include <lfortran/bigint.h>
+#include <lpython/bigint.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/parser/preprocessor.h b/src/lpython/parser/preprocessor.h
similarity index 95%
rename from src/lfortran/parser/preprocessor.h
rename to src/lpython/parser/preprocessor.h
index 375108b1bc..3979557f38 100644
--- a/src/lfortran/parser/preprocessor.h
+++ b/src/lpython/parser/preprocessor.h
@@ -2,8 +2,8 @@
 #define LFORTRAN_SRC_PARSER_PREPROCESSOR_H
 
 #include <libasr/exception.h>
-#include <lfortran/utils.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/utils.h>
+#include <lpython/parser/parser.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/parser/preprocessor.re b/src/lpython/parser/preprocessor.re
similarity index 99%
rename from src/lfortran/parser/preprocessor.re
rename to src/lpython/parser/preprocessor.re
index 4c7b2b53e8..784919cf4e 100644
--- a/src/lfortran/parser/preprocessor.re
+++ b/src/lpython/parser/preprocessor.re
@@ -1,9 +1,9 @@
 #include <iostream>
 #include <map>
 
-#include <lfortran/parser/preprocessor.h>
+#include <lpython/parser/preprocessor.h>
 #include <libasr/assert.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 #include <libasr/string_utils.h>
 
 namespace LFortran
diff --git a/src/lfortran/parser/semantics.h b/src/lpython/parser/semantics.h
similarity index 99%
rename from src/lfortran/parser/semantics.h
rename to src/lpython/parser/semantics.h
index caae43dc12..dfb19fa271 100644
--- a/src/lfortran/parser/semantics.h
+++ b/src/lpython/parser/semantics.h
@@ -12,9 +12,9 @@
 
 #include <cstring>
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/string_utils.h>
-#include <lfortran/parser/parser_exception.h>
+#include <lpython/parser/parser_exception.h>
 
 // This is only used in parser.tab.cc, nowhere else, so we simply include
 // everything from LFortran::AST to save typing:
diff --git a/src/lfortran/parser/tokenizer.h b/src/lpython/parser/tokenizer.h
similarity index 97%
rename from src/lfortran/parser/tokenizer.h
rename to src/lpython/parser/tokenizer.h
index 43f775ed6f..99d65af955 100644
--- a/src/lfortran/parser/tokenizer.h
+++ b/src/lpython/parser/tokenizer.h
@@ -2,7 +2,7 @@
 #define LFORTRAN_SRC_PARSER_TOKENIZER_H
 
 #include <libasr/exception.h>
-#include <lfortran/parser/parser_stype.h>
+#include <lpython/parser/parser_stype.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/parser/tokenizer.re b/src/lpython/parser/tokenizer.re
similarity index 99%
rename from src/lfortran/parser/tokenizer.re
rename to src/lpython/parser/tokenizer.re
index 03a5d2a945..685dc41c03 100644
--- a/src/lfortran/parser/tokenizer.re
+++ b/src/lpython/parser/tokenizer.re
@@ -1,9 +1,9 @@
 #include <limits>
 
-#include <lfortran/parser/parser_exception.h>
-#include <lfortran/parser/tokenizer.h>
-#include <lfortran/parser/parser.tab.hh>
-#include <lfortran/bigint.h>
+#include <lpython/parser/parser_exception.h>
+#include <lpython/parser/tokenizer.h>
+#include <lpython/parser/parser.tab.hh>
+#include <lpython/bigint.h>
 
 namespace LFortran
 {
diff --git a/src/lfortran/pickle.cpp b/src/lpython/pickle.cpp
similarity index 98%
rename from src/lfortran/pickle.cpp
rename to src/lpython/pickle.cpp
index 7e359d4de2..5cca10f47c 100644
--- a/src/lfortran/pickle.cpp
+++ b/src/lpython/pickle.cpp
@@ -1,9 +1,9 @@
 #include <string>
 
-#include <lfortran/pickle.h>
-#include <lfortran/pickle.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/parser.tab.hh>
+#include <lpython/pickle.h>
+#include <lpython/pickle.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/parser.tab.hh>
 #include <libasr/asr_utils.h>
 #include <libasr/string_utils.h>
 
diff --git a/src/lfortran/pickle.h b/src/lpython/pickle.h
similarity index 91%
rename from src/lfortran/pickle.h
rename to src/lpython/pickle.h
index 5c49e7c40e..88e58dba18 100644
--- a/src/lfortran/pickle.h
+++ b/src/lpython/pickle.h
@@ -1,8 +1,8 @@
 #ifndef LFORTRAN_PICKLE_H
 #define LFORTRAN_PICKLE_H
 
-#include <lfortran/parser/parser_stype.h>
-#include <lfortran/ast.h>
+#include <lpython/parser/parser_stype.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 
 namespace LFortran {
diff --git a/src/lfortran/python_serialization.cpp b/src/lpython/python_serialization.cpp
similarity index 95%
rename from src/lfortran/python_serialization.cpp
rename to src/lpython/python_serialization.cpp
index f811894c41..f87aa08d21 100644
--- a/src/lfortran/python_serialization.cpp
+++ b/src/lpython/python_serialization.cpp
@@ -1,7 +1,7 @@
 #include <string>
 
 #include <libasr/config.h>
-#include <lfortran/python_serialization.h>
+#include <lpython/python_serialization.h>
 #include <libasr/bwriter.h>
 #include <libasr/string_utils.h>
 
diff --git a/src/lfortran/python_serialization.h b/src/lpython/python_serialization.h
similarity index 88%
rename from src/lfortran/python_serialization.h
rename to src/lpython/python_serialization.h
index 9126b25377..2269512dfe 100644
--- a/src/lfortran/python_serialization.h
+++ b/src/lpython/python_serialization.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_PYTHON_SERIALIZATION_H
 #define LFORTRAN_PYTHON_SERIALIZATION_H
 
-#include <lfortran/python_ast.h>
+#include <lpython/python_ast.h>
 #include <libasr/asr.h>
 
 namespace LFortran::Python {
diff --git a/src/lfortran/semantics/asr_implicit_cast_rules.h b/src/lpython/semantics/asr_implicit_cast_rules.h
similarity index 99%
rename from src/lfortran/semantics/asr_implicit_cast_rules.h
rename to src/lpython/semantics/asr_implicit_cast_rules.h
index 8848fd7fa5..060bf70152 100644
--- a/src/lfortran/semantics/asr_implicit_cast_rules.h
+++ b/src/lpython/semantics/asr_implicit_cast_rules.h
@@ -2,8 +2,8 @@
 #define LFORTRAN_SEMANTICS_ASR_IMPLICIT_CAST_RULES_H
 
 #include <libasr/asr.h>
-#include <lfortran/ast.h>
-#include <lfortran/semantics/semantic_exception.h>
+#include <lpython/ast.h>
+#include <lpython/semantics/semantic_exception.h>
 
 
 #define num_types 6
diff --git a/src/lfortran/semantics/ast_body_visitor.cpp b/src/lpython/semantics/ast_body_visitor.cpp
similarity index 99%
rename from src/lfortran/semantics/ast_body_visitor.cpp
rename to src/lpython/semantics/ast_body_visitor.cpp
index 1435a6e074..a1bf7a020e 100644
--- a/src/lfortran/semantics/ast_body_visitor.cpp
+++ b/src/lpython/semantics/ast_body_visitor.cpp
@@ -6,17 +6,17 @@
 #include <string>
 #include <cmath>
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
 #include <libasr/exception.h>
-#include <lfortran/semantics/asr_implicit_cast_rules.h>
-#include <lfortran/semantics/ast_common_visitor.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/parser/parser_stype.h>
+#include <lpython/semantics/asr_implicit_cast_rules.h>
+#include <lpython/semantics/ast_common_visitor.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/parser/parser_stype.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/semantics/ast_common_visitor.h b/src/lpython/semantics/ast_common_visitor.h
similarity index 99%
rename from src/lfortran/semantics/ast_common_visitor.h
rename to src/lpython/semantics/ast_common_visitor.h
index 56ae05e267..16b879d5bc 100644
--- a/src/lfortran/semantics/ast_common_visitor.h
+++ b/src/lpython/semantics/ast_common_visitor.h
@@ -2,11 +2,11 @@
 #define LFORTRAN_SEMANTICS_AST_COMMON_VISITOR_H
 
 #include <libasr/asr.h>
-#include <lfortran/ast.h>
-#include <lfortran/bigint.h>
+#include <lpython/ast.h>
+#include <lpython/bigint.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
-#include <lfortran/semantics/comptime_eval.h>
+#include <lpython/utils.h>
+#include <lpython/semantics/comptime_eval.h>
 
 using LFortran::diag::Level;
 using LFortran::diag::Stage;
diff --git a/src/lfortran/semantics/ast_symboltable_visitor.cpp b/src/lpython/semantics/ast_symboltable_visitor.cpp
similarity index 99%
rename from src/lfortran/semantics/ast_symboltable_visitor.cpp
rename to src/lpython/semantics/ast_symboltable_visitor.cpp
index fd9fb17104..f9497be5dc 100644
--- a/src/lfortran/semantics/ast_symboltable_visitor.cpp
+++ b/src/lpython/semantics/ast_symboltable_visitor.cpp
@@ -6,17 +6,17 @@
 #include <cmath>
 #include <limits>
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
 #include <libasr/exception.h>
-#include <lfortran/semantics/asr_implicit_cast_rules.h>
-#include <lfortran/semantics/ast_common_visitor.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/parser/parser_stype.h>
+#include <lpython/semantics/asr_implicit_cast_rules.h>
+#include <lpython/semantics/ast_common_visitor.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/parser/parser_stype.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/semantics/ast_to_asr.cpp b/src/lpython/semantics/ast_to_asr.cpp
similarity index 84%
rename from src/lfortran/semantics/ast_to_asr.cpp
rename to src/lpython/semantics/ast_to_asr.cpp
index 979c8c162a..ddde939eb2 100644
--- a/src/lfortran/semantics/ast_to_asr.cpp
+++ b/src/lpython/semantics/ast_to_asr.cpp
@@ -5,16 +5,16 @@
 #include <string>
 #include <cmath>
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
-#include <lfortran/semantics/asr_implicit_cast_rules.h>
-#include <lfortran/semantics/ast_common_visitor.h>
-#include <lfortran/semantics/ast_to_asr.h>
-#include <lfortran/parser/parser_stype.h>
+#include <lpython/semantics/asr_implicit_cast_rules.h>
+#include <lpython/semantics/ast_common_visitor.h>
+#include <lpython/semantics/ast_to_asr.h>
+#include <lpython/parser/parser_stype.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 
 
 namespace LFortran {
diff --git a/src/lfortran/semantics/ast_to_asr.h b/src/lpython/semantics/ast_to_asr.h
similarity index 93%
rename from src/lfortran/semantics/ast_to_asr.h
rename to src/lpython/semantics/ast_to_asr.h
index 46bfca1dc1..fe211f57b4 100644
--- a/src/lfortran/semantics/ast_to_asr.h
+++ b/src/lpython/semantics/ast_to_asr.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_AST_TO_ASR_H
 #define LFORTRAN_AST_TO_ASR_H
 
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
 
 namespace LFortran {
diff --git a/src/lfortran/semantics/comptime_eval.h b/src/lpython/semantics/comptime_eval.h
similarity index 99%
rename from src/lfortran/semantics/comptime_eval.h
rename to src/lpython/semantics/comptime_eval.h
index 95afae7881..1e60063087 100644
--- a/src/lfortran/semantics/comptime_eval.h
+++ b/src/lpython/semantics/comptime_eval.h
@@ -4,11 +4,11 @@
 #include <complex>
 
 #include <libasr/asr.h>
-#include <lfortran/ast.h>
-#include <lfortran/bigint.h>
+#include <lpython/ast.h>
+#include <lpython/bigint.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
-#include <lfortran/semantics/semantic_exception.h>
+#include <lpython/utils.h>
+#include <lpython/semantics/semantic_exception.h>
 
 namespace LFortran {
 
diff --git a/src/lfortran/semantics/python_ast_to_asr.cpp b/src/lpython/semantics/python_ast_to_asr.cpp
similarity index 99%
rename from src/lfortran/semantics/python_ast_to_asr.cpp
rename to src/lpython/semantics/python_ast_to_asr.cpp
index 3d1ec75003..25ad83a02f 100644
--- a/src/lfortran/semantics/python_ast_to_asr.cpp
+++ b/src/lpython/semantics/python_ast_to_asr.cpp
@@ -9,14 +9,14 @@
 #include <complex>
 #include <sstream>
 
-#include <lfortran/python_ast.h>
+#include <lpython/python_ast.h>
 #include <libasr/asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
-#include <lfortran/semantics/python_ast_to_asr.h>
+#include <lpython/semantics/python_ast_to_asr.h>
 #include <libasr/string_utils.h>
-#include <lfortran/utils.h>
-#include <lfortran/semantics/semantic_exception.h>
+#include <lpython/utils.h>
+#include <lpython/semantics/semantic_exception.h>
 
 
 namespace LFortran::Python {
diff --git a/src/lfortran/semantics/python_ast_to_asr.h b/src/lpython/semantics/python_ast_to_asr.h
similarity index 92%
rename from src/lfortran/semantics/python_ast_to_asr.h
rename to src/lpython/semantics/python_ast_to_asr.h
index cffe9c7747..7d911e3a03 100644
--- a/src/lfortran/semantics/python_ast_to_asr.h
+++ b/src/lpython/semantics/python_ast_to_asr.h
@@ -1,7 +1,7 @@
 #ifndef LFORTRAN_PYTHON_AST_TO_ASR_H
 #define LFORTRAN_PYTHON_AST_TO_ASR_H
 
-#include <lfortran/python_ast.h>
+#include <lpython/python_ast.h>
 #include <libasr/asr.h>
 
 namespace LFortran::Python {
diff --git a/src/lfortran/semantics/semantic_exception.h b/src/lpython/semantics/semantic_exception.h
similarity index 100%
rename from src/lfortran/semantics/semantic_exception.h
rename to src/lpython/semantics/semantic_exception.h
diff --git a/src/lfortran/tests/CMakeLists.txt b/src/lpython/tests/CMakeLists.txt
similarity index 100%
rename from src/lfortran/tests/CMakeLists.txt
rename to src/lpython/tests/CMakeLists.txt
diff --git a/src/lfortran/tests/test_asm.cpp b/src/lpython/tests/test_asm.cpp
similarity index 100%
rename from src/lfortran/tests/test_asm.cpp
rename to src/lpython/tests/test_asm.cpp
diff --git a/src/lfortran/tests/test_ast.cpp b/src/lpython/tests/test_ast.cpp
similarity index 92%
rename from src/lfortran/tests/test_ast.cpp
rename to src/lpython/tests/test_ast.cpp
index e7cf8ce07d..0fbf295fee 100644
--- a/src/lfortran/tests/test_ast.cpp
+++ b/src/lpython/tests/test_ast.cpp
@@ -3,10 +3,10 @@
 #include <iostream>
 
 #include <libasr/alloc.h>
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/semantics/ast_to_asr.h>
+#include <lpython/parser/parser.h>
+#include <lpython/semantics/ast_to_asr.h>
 #include <libasr/asr_verify.h>
 
 namespace LFortran {
diff --git a/src/lfortran/tests/test_ast_to_json.cpp b/src/lpython/tests/test_ast_to_json.cpp
similarity index 96%
rename from src/lfortran/tests/test_ast_to_json.cpp
rename to src/lpython/tests/test_ast_to_json.cpp
index e8a2963ad6..153bcf8297 100644
--- a/src/lfortran/tests/test_ast_to_json.cpp
+++ b/src/lpython/tests/test_ast_to_json.cpp
@@ -4,8 +4,8 @@
 #define RAPIDJSON_HAS_STDSTRING 1
 #include <rapidjson/document.h>
 
-#include <lfortran/ast_to_json.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/ast_to_json.h>
+#include <lpython/parser/parser.h>
 
 using namespace rapidjson;
 using LFortran::TRY;
diff --git a/src/lfortran/tests/test_cwrapper.c b/src/lpython/tests/test_cwrapper.c
similarity index 95%
rename from src/lfortran/tests/test_cwrapper.c
rename to src/lpython/tests/test_cwrapper.c
index 079f366468..ef326da204 100644
--- a/src/lfortran/tests/test_cwrapper.c
+++ b/src/lpython/tests/test_cwrapper.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <lfortran/cwrapper.h>
+#include <lpython/cwrapper.h>
 
 void test_parse()
 {
diff --git a/src/lfortran/tests/test_error_rendering.cpp b/src/lpython/tests/test_error_rendering.cpp
similarity index 99%
rename from src/lfortran/tests/test_error_rendering.cpp
rename to src/lpython/tests/test_error_rendering.cpp
index 1775b86fbd..68ee33d83a 100644
--- a/src/lfortran/tests/test_error_rendering.cpp
+++ b/src/lpython/tests/test_error_rendering.cpp
@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include <libasr/diagnostics.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/parser/parser.h>
 
 namespace {
 
diff --git a/src/lfortran/tests/test_llvm.cpp b/src/lpython/tests/test_llvm.cpp
similarity index 99%
rename from src/lfortran/tests/test_llvm.cpp
rename to src/lpython/tests/test_llvm.cpp
index bb45581027..c854f2f532 100644
--- a/src/lfortran/tests/test_llvm.cpp
+++ b/src/lpython/tests/test_llvm.cpp
@@ -2,15 +2,15 @@
 
 #include <cmath>
 
-#include <lfortran/fortran_evaluator.h>
+#include <lpython/fortran_evaluator.h>
 #include <libasr/codegen/evaluator.h>
 #include <libasr/exception.h>
-#include <lfortran/ast.h>
+#include <lpython/ast.h>
 #include <libasr/asr.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/semantics/ast_to_asr.h>
+#include <lpython/parser/parser.h>
+#include <lpython/semantics/ast_to_asr.h>
 #include <libasr/codegen/asr_to_llvm.h>
-#include <lfortran/pickle.h>
+#include <lpython/pickle.h>
 
 using LFortran::TRY;
 using LFortran::FortranEvaluator;
diff --git a/src/lfortran/tests/test_parse.cpp b/src/lpython/tests/test_parse.cpp
similarity index 99%
rename from src/lfortran/tests/test_parse.cpp
rename to src/lpython/tests/test_parse.cpp
index 3e4c029973..2bff7d2ff3 100644
--- a/src/lfortran/tests/test_parse.cpp
+++ b/src/lpython/tests/test_parse.cpp
@@ -5,9 +5,9 @@
 #include <chrono>
 #include <string>
 
-#include <lfortran/parser/parser.h>
-#include <lfortran/parser/parser.tab.hh>
-#include <lfortran/bigint.h>
+#include <lpython/parser/parser.h>
+#include <lpython/parser/parser.tab.hh>
+#include <lpython/bigint.h>
 
 using LFortran::parse;
 using LFortran::TRY;
diff --git a/src/lfortran/tests/test_pickle.cpp b/src/lpython/tests/test_pickle.cpp
similarity index 98%
rename from src/lfortran/tests/test_pickle.cpp
rename to src/lpython/tests/test_pickle.cpp
index 4cdd0d36cf..919b6395ce 100644
--- a/src/lfortran/tests/test_pickle.cpp
+++ b/src/lpython/tests/test_pickle.cpp
@@ -1,9 +1,9 @@
 #include <tests/doctest.h>
 #include <iostream>
 
-#include <lfortran/pickle.h>
-#include <lfortran/ast_to_src.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/pickle.h>
+#include <lpython/ast_to_src.h>
+#include <lpython/parser/parser.h>
 
 void section(const std::string &s)
 {
diff --git a/src/lfortran/tests/test_serialization.cpp b/src/lpython/tests/test_serialization.cpp
similarity index 98%
rename from src/lfortran/tests/test_serialization.cpp
rename to src/lpython/tests/test_serialization.cpp
index 1abd35b116..dce5d8544c 100644
--- a/src/lfortran/tests/test_serialization.cpp
+++ b/src/lpython/tests/test_serialization.cpp
@@ -3,11 +3,11 @@
 
 #include <libasr/bwriter.h>
 #include <libasr/serialization.h>
-#include <lfortran/ast_serialization.h>
+#include <lpython/ast_serialization.h>
 #include <libasr/modfile.h>
-#include <lfortran/pickle.h>
-#include <lfortran/parser/parser.h>
-#include <lfortran/semantics/ast_to_asr.h>
+#include <lpython/pickle.h>
+#include <lpython/parser/parser.h>
+#include <lpython/semantics/ast_to_asr.h>
 #include <libasr/asr_utils.h>
 #include <libasr/asr_verify.h>
 
diff --git a/src/lfortran/tests/test_stacktrace.cpp b/src/lpython/tests/test_stacktrace.cpp
similarity index 100%
rename from src/lfortran/tests/test_stacktrace.cpp
rename to src/lpython/tests/test_stacktrace.cpp
diff --git a/src/lfortran/tests/test_stacktrace2.cpp b/src/lpython/tests/test_stacktrace2.cpp
similarity index 94%
rename from src/lfortran/tests/test_stacktrace2.cpp
rename to src/lpython/tests/test_stacktrace2.cpp
index 2a98114f89..ec85474a1f 100644
--- a/src/lfortran/tests/test_stacktrace2.cpp
+++ b/src/lpython/tests/test_stacktrace2.cpp
@@ -2,9 +2,9 @@
 #include <iostream>
 
 #include <libasr/stacktrace.h>
-#include <lfortran/pickle.h>
-#include <lfortran/ast_to_src.h>
-#include <lfortran/parser/parser.h>
+#include <lpython/pickle.h>
+#include <lpython/ast_to_src.h>
+#include <lpython/parser/parser.h>
 
 
 TEST_CASE("Address to line number"){
diff --git a/src/lfortran/utils.cpp b/src/lpython/utils.cpp
similarity index 88%
rename from src/lfortran/utils.cpp
rename to src/lpython/utils.cpp
index 02cee2670d..d7e501e5b2 100644
--- a/src/lfortran/utils.cpp
+++ b/src/lpython/utils.cpp
@@ -10,7 +10,7 @@
 #include <bin/tpl/whereami/whereami.h>
 
 #include <libasr/exception.h>
-#include <lfortran/utils.h>
+#include <lpython/utils.h>
 #include <libasr/string_utils.h>
 
 namespace LFortran {
@@ -46,13 +46,13 @@ std::string get_runtime_library_dir()
         || endswith(dirname, "SRC\\BIN")) {
         // Development version
         return dirname + "/../runtime";
-    } else if (endswith(dirname, "src/lfortran/tests") ||
-               endswith(to_lower(dirname), "src\\lfortran\\tests")) {
+    } else if (endswith(dirname, "src/lpython/tests") ||
+               endswith(to_lower(dirname), "src\\lpython\\tests")) {
         // CTest Tests
         return dirname + "/../../runtime";
     } else {
         // Installed version
-        return dirname + "/../share/lfortran/lib";
+        return dirname + "/../share/lpython/lib";
     }
 }
 
diff --git a/src/lfortran/utils.h b/src/lpython/utils.h
similarity index 100%
rename from src/lfortran/utils.h
rename to src/lpython/utils.h
diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt
index 32e3c10540..61633e3d48 100644
--- a/src/runtime/legacy/CMakeLists.txt
+++ b/src/runtime/legacy/CMakeLists.txt
@@ -9,6 +9,6 @@ set_target_properties(lfortran_runtime_static PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY ..)
 install(TARGETS lfortran_runtime lfortran_runtime_static
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION share/lfortran/lib
-    LIBRARY DESTINATION share/lfortran/lib
+    ARCHIVE DESTINATION share/lpython/lib
+    LIBRARY DESTINATION share/lpython/lib
 )