diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 68ff6f961ea..ebf8f6b3217 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ Currently, Soot follows the [git-flow branching model](http://nvie.com/posts/a-s
All our nightly tests and builds operate on develop branch.
## Pull Request
-> Note: If you already have a fork of Soot and need to merge our formatting changes, [this](https://github.com/Sable/soot/wiki/Merging-changes-after-introduction-of-formatting-guidelines) might help.
+> Note: If you already have a fork of Soot and need to merge our formatting changes, [this](https://github.com/soot-oss/soot/wiki/Merging-changes-after-introduction-of-formatting-guidelines) might help.
To fix a problem in Soot or to contribute to Soot you can fork the Soot project on GitHub. This will generate a personal cloned repository for you to work on. To reincorporate your changes into Soot after they have been completed and tested, just send us a [pull request](https://help.github.com/articles/using-pull-requests). This will allow us to review your changes and merge them into the develop branch.
@@ -14,15 +14,15 @@ To fix a problem in Soot or to contribute to Soot you can fork the Soot project
Pull requests will have to conform to our coding style guidelines which are _as close as possible_* to the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). Our build server will reject pull requests that do not comply with our guidelines.
Tutorials on how to apply automatic formatting and style enhancements can be found here:
-* [Eclipse](https://github.com/Sable/soot/wiki/Formatting-for-Eclipse)
-* [IntelliJ Idea](https://github.com/Sable/soot/wiki/Formatting-for-IntelliJ)
+* [Eclipse](https://github.com/soot-oss/soot/wiki/Formatting-for-Eclipse)
+* [IntelliJ Idea](https://github.com/soot-oss/soot/wiki/Formatting-for-IntelliJ)
Compliance with our guidelines is ensured by the Maven Checkstyle plugin. One can run the checks by invoking `mvn checkstyle:check`. Also, the check is bound to the Maven's `verify` phase.
Our build server will reject pull requests with existing violations.
### License header
-Newly created classes will have to have a [correct license header](https://github.com/Sable/soot/wiki/License-Header) right after the _package declaration_ of the class. Our build server will reject pull requests with missing license headers. The license check can be run locally by invoking `mvn license:check-file-header` or during the `verify` phase.
+Newly created classes will have to have a [correct license header](https://github.com/soot-oss/soot/wiki/License-Header) right after the _package declaration_ of the class. Our build server will reject pull requests with missing license headers. The license check can be run locally by invoking `mvn license:check-file-header` or during the `verify` phase.
**Make sure that `mvn clean verify` terminates successfully before setting up a pull request or committing to the repository directly!**
diff --git a/README.md b/README.md
index 481ac0ed69f..6b53ead05c0 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-[](https://github.com/Sable/soot/actions)
-[](https://gitpod.io/#https://github.com/Sable/soot)
+[](https://github.com/soot-oss/soot/actions)
+[](https://gitpod.io/#https://github.com/soot-oss/soot)
# Using Soot? Let us know about it!
-We are regularly applying for funding to help us maintain Soot. You can help us immensely by letting us know about [**projects that use Soot**](https://github.com/Sable/soot/wiki/Users-of-Soot), both commercially or in the form of research tools.
+We are regularly applying for funding to help us maintain Soot. You can help us immensely by letting us know about [**projects that use Soot**](https://github.com/soot-oss/soot/wiki/Users-of-Soot), both commercially or in the form of research tools.
Also many thanks to [](https://www.ej-technologies.com/products/jprofiler/overview.html) for supporting Soot with a free-to-use open source license!
@@ -33,9 +33,9 @@ See http://www.sable.mcgill.ca/soot/ for details.
# How do I get started with Soot?
-We have some documentation on Soot in the [wiki](https://github.com/Sable/soot/wiki) and also a large range of [tutorials](http://www.sable.mcgill.ca/soot/tutorial/index.html) on Soot.
+We have some documentation on Soot in the [wiki](https://github.com/soot-oss/soot/wiki) and also a large range of [tutorials](http://www.sable.mcgill.ca/soot/tutorial/index.html) on Soot.
-For detailed information please also consider the Soot's [JavaDoc and Options](https://github.com/Sable/soot/wiki/Options-and-JavaDoc) Documentations.
+For detailed information please also consider the Soot's [JavaDoc and Options](https://github.com/soot-oss/soot/wiki/Options-and-JavaDoc) Documentations.
# Including Soot in your Project
@@ -66,7 +66,7 @@ The `soot-.jar` file contains only Soot, allowing you to manually pick
# Building Soot yourself
-If you cannot work with the prebuild versions and need to build Soot on your own, please consider the [wiki](https://github.com/Sable/soot/wiki/Building-Soot-from-the-Command-Line-(Recommended)) for further steps.
+If you cannot work with the prebuild versions and need to build Soot on your own, please consider the [wiki](https://github.com/soot-oss/soot/wiki/Building-Soot-from-the-Command-Line-(Recommended)) for further steps.
# About Soot's source code
@@ -77,7 +77,7 @@ mailing list at: http://www.sable.mcgill.ca/mailman/listinfo/soot-list/
# How do I contribute to Soot?
-We are happy to accept arbitrary improvements to Soot in form of GitHub pull requests. Please read our [contribution guidelines](https://github.com/Sable/soot/wiki/Contributing-to-Soot) before setting up a pull request.
+We are happy to accept arbitrary improvements to Soot in form of GitHub pull requests. Please read our [contribution guidelines](https://github.com/soot-oss/soot/wiki/Contributing-to-Soot) before setting up a pull request.
# Please help us improve Soot!
You are using Soot and would like to help us support it in the future? Then please support us by filling out [this little web form](https://goo.gl/forms/rk1oSxFIxAH0xaf52).
diff --git a/README.md.orig b/README.md.orig
deleted file mode 100644
index 866051ffe5c..00000000000
--- a/README.md.orig
+++ /dev/null
@@ -1,192 +0,0 @@
-<<<<<<< HEAD
-[](https://soot-build.cs.uni-paderborn.de/jenkins/job/soot/job/soot-pipeline/job/master/)
-[](https://gitpod.io/#https://github.com/Sable/soot)
-
-=======
-[](https://github.com/Sable/soot/actions)
-[](https://gitpod.io/#https://github.com/Sable/soot)
-
-
->>>>>>> develop
-# Using Soot? Let us know about it!
-We are regularly applying for funding to help us maintain Soot. You can help us immensely by letting us know about [**projects that use Soot**](https://github.com/Sable/soot/wiki/Users-of-Soot), both commercially or in the form of research tools.
-
-Also many thanks to [](https://www.ej-technologies.com/products/jprofiler/overview.html) for supporting Soot with a free-to-use open source license!
-
-# Soot supports Java 9 modules now!
-Try and get involved in Soot's Java 9 bleeding edge developement.
-## What works and is tested?
-* Automatic modules (modules automatically created from jars in the module-path)
-* Named modules
-* Exploded modules
-* Modular jar files
-* Resolving modules in Soot's `ModuleScene`
-* Spark
-
-<<<<<<< HEAD
-## What does not work yet?
-* Anonymous modules (mixing module- and class-path)
-* Multi-module jar files
-=======
- ## What does not work yet?
- * Anonymous modules (mixing module- and class-path)
- * Multi-module jar files
->>>>>>> develop
-
-# What is Soot?
-
-Soot is a Java optimization framework. It provides four intermediate representations for analyzing and transforming Java bytecode:
-
-* Baf: a streamlined representation of bytecode which is simple to manipulate.
-* Jimple: a typed 3-address intermediate representation suitable for optimization.
-* Shimple: an SSA variation of Jimple.
-* Grimp: an aggregated version of Jimple suitable for decompilation and code inspection.
-
-See http://www.sable.mcgill.ca/soot/ for details.
-
-# How do I get started with Soot?
-
-We have some documentation on Soot in the [wiki](https://github.com/Sable/soot/wiki) and also a large range of [tutorials](http://www.sable.mcgill.ca/soot/tutorial/index.html) on Soot.
-
-For detailed information please also consider the Soot's [JavaDoc and Options](https://github.com/Sable/soot/wiki/Options-and-JavaDoc) Documentations.
-
-# Including Soot in your Project
-
-A Soot release is currently built for each commit to the `master` branch. You can include Soot as
-a dependency via Maven, Gradle, SBT, etc using the following coordinates:
-
-
-```.xml
-
-
- ca.mcgill.sable
- soot
-<<<<<<< HEAD
- 4.1.0
-=======
- 4.1.0-SNAPSHOT
->>>>>>> develop
-
-
-```
-
-<<<<<<< HEAD
-You can also obtain older builds of the `master` branch. A complete listing of builds can be found on [Maven Central](https://repo.maven.apache.org/maven2/ca/mcgill/sable/soot/).
-=======
-You can also obtain older builds of the `develop` branch. A complete listing of builds can be found in [Sonatype's SNAPSHOT repository](https://oss.sonatype.org/content/repositories/snapshots/ca/mcgill/sable/soot/).
->>>>>>> develop
-
-# How do I obtain Soot without Maven?
-**We recommend using Soot with Maven**
-
-You can obtain the latest release build of Soot [directly](https://repo1.maven.org/maven2/ca/mcgill/sable/soot/).
-
-The `soot--jar-with-dependencies.jar` file is an all-in-one file that also contains all the required libraries.
-
-The `soot-.jar` file contains only Soot, allowing you to manually pick dependencies as you need them. If you do not want to bother with dependencies, we recommend using the former.
-
-# Building Soot yourself
-
-If you cannot work with the prebuild versions and need to build Soot on your own, please consider the [wiki](https://github.com/Sable/soot/wiki/Building-Soot-from-the-Command-Line-(Recommended)) for further steps.
-
-# About Soot's source code
-
-Soot follows the git-flow convention. Releases and hotfixes are maintained in the master branch.
-Development happens in the develop branch. To catch the bleeding edge of Soot, check out the latter.
-In case of any questions, please consult the Soot
-mailing list at: http://www.sable.mcgill.ca/mailman/listinfo/soot-list/
-
-# How do I contribute to Soot?
-
-We are happy to accept arbitrary improvements to Soot in form of GitHub pull requests. Please read our [contribution guidelines](https://github.com/Sable/soot/wiki/Contributing-to-Soot) before setting up a pull request.
-
-# Please help us improve Soot!
-You are using Soot and would like to help us support it in the future? Then please support us by filling out [this little web form](https://goo.gl/forms/rk1oSxFIxAH0xaf52).
-
-That way you can help us in two ways:
-* By letting us know how we can improve Soot you can directly help us prioritize newly planned features.
-* By stating your name and affiliation you help us showcasing Soot’s large user base.
-Thanks!
-
-# How to use Soot's Java 9 Features?
-
-If you want to run Soot with Java > 8, you are done. Just run it as usal.
-If you want to execute Soot with Java 8 but analyze Java >8 Projects or vice versa, see below.
-
-## Use from Source Code
-To load modules in Soot's `ModuleScene` from java:
-```.java
-// configure Soot's options
-Options.v().set_soot_modulepath(modulePath);
-
-
-// load classes from modules into Soot
-Map> map = ModulePathSourceLocator.v().getClassUnderModulePath(modulePath);
-for (String module : map.keySet()) {
- for (String klass : map.get(module)) {
- logger.info("Loaded Class: " + klass + "\n");
- loadClass(klass, false, module);
-
- }
-}
-
-
-//this must be called after all classes are loaded
-Scene.v().loadNecessaryClasses();
-
-
-public static SootClass loadClass(String name, boolean main, String module) {
- SootClass c = ModuleScene.v().loadClassAndSupport(name, Optional.of(module));
- c.setApplicationClass();
- if (main)
- Scene.v().setMainClass(c);
- return c;
-}
-
-```
-
-
-### Example Configurations: Java 8, Java >= 9 Classpath, Java >= 9 Modulepath
-
-```.java
-
-if(java < 9 ) {
- Options.v().set_prepend_classpath(true);
- Options.v().set_process_dir(Arrays.asList(applicationClassPath().split(File.pathSeparator)));
- Options.v().set_claspath(sootClassPath();
-}
-
-if(java >= 9 && USE_CLASSPATH){
- Options.v().set_soot_classpath("VIRTUAL_FS_FOR_JDK" + File.pathSeparator + sootClassPath());
- Options.v().set_process_dir(Arrays.asList(applicationClassPath().split(File.pathSeparator)));
-}
-
-
-if(java>=9 && USE_MODULEPATH){
- Options.v().set_prepend_classpath(true);
- Options.v().set_soot_modulepath(ootClassPath());
- Options.v().set_process_dir(Arrays.asList(applicationClassPath().split(File.pathSeparator)));
-}
-
-```
-
-## Use from the Command Line
-To execute Soot using Java 1.9, but analyzing a classpath run, just as before:
-`java -cp soot-trunk.jar soot.Main --process-dir directoryToAnalyse`
-
-
-if you want to specify the classpath explicitly run:
-`java -cp soot-trunk.jar soot.Main -cp VIRTUAL_FS_FOR_JDK --process-dir directoryToAnalyse`
-
-the value `VIRTUAL_FS_FOR_JDK` indicates that Soot should search Java's (>9) virtual filesystem `jrt:/` for classes, too, although Soot is not executed in module mode.
-
-
-To load modules and classes in Soot using java 1.8 run:
-
-` java -cp PATH_TO_JAVA9/jrt-fs.jar:soot-trunk.jar soot.Main -pp -soot-modulepath modules/ `
-
-
-Please replace `PATH_TO_JAVA9` with the path to your local installation of java 9.
-The `jrt-fs.jar` is a built-in NIO FileSystem provider for the jrt:// filesystem java 9 uses that replaces `rt.jar`.
-
-
diff --git a/index.html b/index.html
index 094962655a9..dbff2b06f41 100644
--- a/index.html
+++ b/index.html
@@ -138,7 +138,7 @@