diff --git a/.bsp/sbt.json b/.bsp/sbt.json
new file mode 100644
index 00000000..aacd555a
--- /dev/null
+++ b/.bsp/sbt.json
@@ -0,0 +1 @@
+{"name":"sbt","version":"1.10.0","bspVersion":"2.1.0-M1","languages":["scala"],"argv":["C:\\Program Files\\Java\\jdk-24/bin/java","-Xms100m","-Xmx100m","-classpath","C:/Users/strup/AppData/Roaming/JetBrains/IdeaIC2025.1/plugins/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp","--sbt-launch-jar=C:/Users/strup/AppData/Roaming/JetBrains/IdeaIC2025.1/plugins/Scala/launcher/sbt-launch.jar"]}
\ No newline at end of file
diff --git a/.checkstyle b/.checkstyle
deleted file mode 100644
index 13c22bfb..00000000
--- a/.checkstyle
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/.factorypath b/.factorypath
new file mode 100644
index 00000000..a1b94281
--- /dev/null
+++ b/.factorypath
@@ -0,0 +1,3 @@
+
+
+
diff --git a/.gitignore b/.gitignore
index b7b589b8..78dd32c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,71 +1,40 @@
+arbeit
+/peimages
/ignore
/portexstats
/portextestfiles
-/lib
-/sbt
+/.idea
+portextestfiles
.idea
-.history
-.factorypath
-.metadata
-*.class
*.sh
*.py
-UserDB.TXT
-userdb.jclausing.txt
-testuserdb.txt
-filenotes.txt
-*.png
-
-# tex files #
-*.acn
-*.acr
-*.alg
-*.bbl
-*.blg
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.myacrin
-*.myacrlog
-*.myacrout
-*.out
-arbeit.pdf
-*.thm
-*.toc
-
+*.dll
+Virus.Tirtas
codecover
-.settings
+fileanomalies
+filelist
+literature
+pevscript.sh
+todo
+src/main/resources
.classpath
-.project
-/data
-src/main/target/*
-*.exe
-*.dll
-
-# Package Files #
-*.war
-*.ear
-/target
-/bin
-vtapikey
.cache
-project/project/*
-project/target/*
-*~
-*.aux
test-output
-
-arbeit/.svn
-arbeit/appendix
-arbeit/dia1
-/.apt_generated
-/.cache-main
-/.cache-tests
-/.bsp/sbt.json
+*.txt
+*.TXT
+vtapikey
+target
+bin
+BinaryCollection
+*.exe
+project
+*~
+.settings
+.project
+/.idea/.gitignore
+/portextestfiles/testfiles/6fdfdffeb4b1be2d0036bac49cb0d590
+/portextestfiles/testfiles/adodb.dll
+/portextestfiles/corkami/aslr.dll
+/portextestfiles/testfiles/baed21297974b6adf3298585baa78691
+/portextestfiles/BinaryCorpus_v2_oldCorkami/corkami/ca.crt
+/portextestfiles/BinaryCorpus_v2_oldCorkami/helloworld/non-PE/com-openwatcom.com
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bb167314..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: scala
-scala:
- - 2.12.13
-jdk:
- - openjdk8
-sudo: false
-script: "sbt ++$TRAVIS_SCALA_VERSION compile test"
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 14e6b35f..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2014 Katja Hahn
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e84a734..00000000
--- a/README.md
+++ /dev/null
@@ -1,135 +0,0 @@
-PortEx
-======
-
-## Welcome to PortEx
-
-PortEx is a Java library for static malware analysis of Portable Executable files. Its focus is on PE malformation robustness, and anomaly detection.
-PortEx is written in Java and Scala, and targeted at Java applications.
-
-
-
-## Features
-
-* Reading header information from: MSDOS Header, COFF File Header, Optional Header, Section Table
-* Reading PE structures: Imports, Resources, Exports, Debug Directory, Relocations, Delay Load Imports, Bound Imports
-* Dumping of sections, resources, overlay, embedded ZIP, JAR or .class files
-* Scanning for file format anomalies, including structural anomalies, deprecated, reserved, wrong or non-default values.
-* Visualize PE file structure, local entropies and byteplot of the file with variable colors and sizes
-* Calculate Shannon Entropy and Chi Squared for files and sections
-* Calculate ImpHash and Rich and RichPV hash values for files and sections
-* Parse RichHeader and verify checksum
-* Calculate and verify Optional Header checksum
-* Scan for PEiD signatures, internal file type signatures or your own signature database
-* Scan for Jar to EXE wrapper (e.g. exe4j, jsmooth, jar2exe, launch4j)
-* Extract Unicode and ASCII strings contained in the file
-* Extraction and conversion of .ICO files from icons in the resource section
-* Extraction of version information and manifest from the file
-* Reading .NET metadata and streams (Alpha)
-
-For more information have a look at [PortEx Wiki](https://github.com/struppigel/PortEx/wiki) and the [Documentation](http://struppigel.github.io/PortEx/javadocs/)
-
-## PortexAnalyzer CLI and GUI
-
-PortexAnalyzer CLI is a command line tool that runs the library PortEx under the hood.
-
-If you are looking for a readily compiled command line PE scanner to analyse files with it, you will find the newest version here [PortexAnalyzer.jar](https://github.com/struppigel/PortEx/raw/master/progs/PortexAnalyzer.jar)
-
-The long-term release version of the CLI tool is on the [releases page](https://github.com/struppigel/PortEx/releases).
-
-The GUI version is available here: [PortexAnalyzerGUI](https://github.com/struppigel/PortexAnalyzerGUI)
-
-## Using PortEx
-
-### Including PortEx to a Maven Project
-
-You can include PortEx to your project by adding the following Maven dependency:
-
-```
-
- io.github.struppigel
- portex_2.12
- 5.0.6
-
-```
-
-To use a local build, add the library as follows:
-
-```
-
- io.github.struppigel
- portex_2.12
- 5.0.6
- system
- $PORTEXDIR/target/scala-2.12/portex_2.12-5.0.6.jar
-