diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12dcf6e..329d899 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,18 @@
-# This file is a template, and might need editing before it works on your project.
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
-
-# This is a sample GitLab CI/CD configuration file that should run without any modifications.
-# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
-# it uses echo commands to simulate the pipeline execution.
-#
-# A pipeline is composed of independent jobs that run scripts, grouped into stages.
-# Stages run in sequential order, but jobs within stages run in parallel.
-#
-# For more information, see: https://docs.gitlab.com/ee/ci/yaml/README.html#stages
 image: ubuntu
-stages:          # List of stages for jobs, and their order of execution
-  - build
-#   - test
-#   - deploy
 
-build-job:       # This job runs in the build stage, which runs first.
+stages:
+  - tools
+  - build
+
+tools-job:
+  stage: tools
+    - echo "Installing dependencies..."
+    - apt update && apt install -y make iverilog gcc-8-riscv64-linux-gnu
+    - echo "Done"
+
+build-job:
   stage: build
   script:
-    - echo "Installing dependencies"
-    - apt update && apt install -y make iverilog gcc-8-riscv64-linux-gnu
     - echo "Compiling the code..."
-    - make
+    - make sim
     - echo "Compile complete."
-
-# unit-test-job:   # This job runs in the test stage.
-#   stage: test    # It only starts when the job in the build stage completes successfully.
-#   script:
-#     - echo "Running unit tests... This will take about 60 seconds."
-#     - sleep 60
-#     - echo "Code coverage is 90%"
-
-# lint-test-job:   # This job also runs in the test stage.
-#   stage: test    # It can run at the same time as unit-test-job (in parallel).
-#   script:
-#     - echo "Linting code... This will take about 10 seconds."
-#     - sleep 10
-#     - echo "No lint issues found."
-
-# deploy-job:      # This job runs in the deploy stage.
-#   stage: deploy  # It only runs when *both* jobs in the test stage complete successfully.
-#   script:
-#     - echo "Deploying application..."
-#     - echo "Application successfully deployed."
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6998d4f..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "test/elf2hex"]
-	path = test/elf2hex
-	url = https://github.com/sifive/elf2hex.git
diff --git a/project.cfg b/project.cfg
deleted file mode 100644
index c083174..0000000
--- a/project.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-XILINX = /opt/Xilinx/14.7/ISE_DS/ISE/
-PROJECT = riscv_core
-TARGET_PART = xc6slx25-3-ftg256
-
-SVSOURCE = hdl/test.sv
-VSOURCE = hdl/core.v hdl/top.v hdl/axi_lite_memory.v
-# VHDSOURCE = hdl/*.vhd
-
-VTEST = hdl/tb/core_tb.v
-# VHDTEST = hdl/tb/*.vhd
-TB = core_tb
-
-# XILINX_PLATFORM = lin64
-
-TOPLEVEL = top
-CONSTRAINTS = pins.ucf
-# COMMON_OPTS =
-# XST_OPTS = 
-# NGDBUILD_OPTS = 
-MAP_OPTS = -mt 2 -ol high
-PAR_OPTS = -mt 4 -ol high
-# BITGEN_OPTS = -g Compress
-# TRACE_OPTS = 
-# FUSE_OPTS = 
-
-PROGRAMMER = xc3sprog
-XC3SPROG_CABLE = ftdi
\ No newline at end of file
diff --git a/test/.gitignore b/test/.gitignore
index dc96e83..cc65b37 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,4 +1 @@
-elf2hex
-*.elf
-*.hex
 *.~lock*
\ No newline at end of file
diff --git a/test/test.csv b/test/test.csv
deleted file mode 100644
index 939004c..0000000
--- a/test/test.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-
-test.elf:     file format elf64-littleriscv
-
-Contents of section .text:
- 0000 b3000000 33010000 b3010000 33020000  ....3.......3...
- 0010 b3020000 33030000 b3030000 33040000  ....3.......3...
- 0020 b3040000 33050000 b3050000 33060000  ....3.......3...
- 0030 b3060000 33070000 b3070000 33080000  ....3.......3...
- 0040 b3080000 33090000 b3090000 330a0000  ....3.......3...
- 0050 b30a0000 330b0000 b30b0000 330c0000  ....3.......3...
- 0060 b30c0000 330d0000 b30d0000 330e0000  ....3.......3...
- 0070 b30e0000 330f0000 b30f0000           ....3.......