7 files changed, 66 insertions, 78 deletions
diff --git a/src/Enums/Status.scala b/src/Enums/Status.scala
deleted file mode 100644
index e69de29..0000000
--- a/src/Enums/Status.scala
+++ /dev/null
diff --git a/src/Main.scala b/src/Main.scala
deleted file mode 100644
index 39851cb..0000000
--- a/src/Main.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.nsrddyn
-
-import com.nsrddyn.fpu.CholeskyDecomposition
-import com.nsrddyn.Tests.CholeskyDecompositionTest
-import java.time.Instant
-import com.nsrddyn.alu.*
-import com.nsrddyn.tools.Benchmark
-
-enum Status:
-  case PASS 
-  case FAIL 
-
-
-object Torque extends ZIOAppDefault {
-
-  println("hello world")
-
-  @main def main(args: String*): Unit =  { println("\u001b[2J\u001b[H")
-    println("--- TORQUE STRESS TESTING UTILITY ---")
-
-    var tester: CholeskyDecompositionTest = new CholeskyDecompositionTest
-    println(tester.test())
-
-  }
-
-  var p: Prime = new Prime
-  p.run()
-
-}
-
diff --git a/src/main/scala/main/Main.scala b/src/main/scala/main/Main.scala
new file mode 100644
index 0000000..d03eeb9
--- /dev/null
+++ b/src/main/scala/main/Main.scala
@@ -0,0 +1,22 @@
+package main 
+
+import Ops.*
+import Tests.*
+import tools.*
+import java.time.Instant
+
+object Torque {
+
+  @main
+  def main(args: String*): Unit =  { println("\u001b[2J\u001b[H")
+    println("--- TORQUE STRESS TESTING UTILITY ---")
+
+    var cdt: CholeskyDecompositionTest = new CholeskyDecompositionTest
+    // returns an out of bounds error
+    // println(cdt.test())
+    var p: Prime = new Prime
+    p.run(1000000000, true)
+
+  }
+}
+
diff --git a/src/Ops/Prime.scala b/src/main/scala/main/Ops/Ops.scala
index bd93ee1..6db51a9 100644
--- a/src/Ops/Prime.scala
+++ b/src/main/scala/main/Ops/Ops.scala
@@ -1,8 +1,10 @@
-package com.nsrddyn.ops
-import com.nsrddyn.tools.Benchmark
+package main.Ops
+
+import main.tools.Benchmark
+import main.Traits.*
+
 import scala.util.hashing
 import scala.util.hashing.MurmurHash3
-import  com.nsrddyn.Traits.*
 import scala.math._
 import scala.collection.immutable.ListSet
 import scala.collection.mutable.ArrayBuffer
@@ -41,35 +43,8 @@ class Prime()  {
 
     for i <- 0 to n do if isPrime(i) == result then println("true") else println("false") 
   }
-
-
 }
 
-
-
-
-class PrimeRunner {
-
-
-  def run(threads: Int): Unit = {
-
-    val pr = new Prime()
-    val br = new Benchmark()
-
-    /*
-     * test cases
-     *
-     * 7919 true
-     * 2147483647 false
-     */
-
-    val time = pr.run(7919, true)
-    println(time)
-
-  } 
-}
-
-
 class Hash {
 
   def run(word: String, loopSize: Int): Unit = {
@@ -91,7 +66,7 @@ class Hash {
      *
      */ 
 
-     for i <- 0 to loopSize do MurmurHash3.stringHash(word) 
+    for i <- 0 to loopSize do MurmurHash3.stringHash(word) 
 
   }
 }
@@ -121,10 +96,10 @@ class CholeskyDecomposition {
     val lower: ArrayBuffer[ArrayBuffer[Int]] = ArrayBuffer[ArrayBuffer[Int]]()
 
     for 
-      i <- 0 to size 
-      j <- 0 until i 
+    i <- 0 to size 
+    j <- 0 until i 
     do 
-      if i == j then lower(i)(j) = getSquaredSummation(lower, i, j, matrix) else lower(j)(j) = getReversedSummation(lower, i, j, matrix)
+    if i == j then lower(i)(j) = getSquaredSummation(lower, i, j, matrix) else lower(j)(j) = getReversedSummation(lower, i, j, matrix)
 
   }
 
diff --git a/src/Tests/Tests.scala b/src/main/scala/main/Tests/Tests.scala
index 88fd139..851ac4d 100644
--- a/src/Tests/Tests.scala
+++ b/src/main/scala/main/Tests/Tests.scala
@@ -1,16 +1,9 @@
-package com.nsrddyn.Tests
+package main.Tests
 
-import com.nsrddyn.fpu.CholeskyDecomposition
 import scala.collection.immutable.ListSet
 import zio._
+import main.Ops.CholeskyDecomposition
 
-class TestsRunner extends ZIOAppDefault {
-  
-  def run =
-    println("Hello world")
-
-
-}
 
 class CholeskyDecompositionTest  {
 
@@ -22,7 +15,4 @@ class CholeskyDecompositionTest  {
     println(cdp.run(matrix))
 
   }
-
-
-
 }
diff --git a/src/Tools/Benchmark.scala b/src/main/scala/main/Tools/Benchmark.scala
index a0b388b..eb1a6d4 100644
--- a/src/Tools/Benchmark.scala
+++ b/src/main/scala/main/Tools/Benchmark.scala
@@ -1,4 +1,6 @@
-package com.nsrddyn.tools
+package main.tools
+
+import main.Ops.*
 
 class Benchmark {
   /* 
@@ -15,3 +17,26 @@ class Benchmark {
   // TODO: map this to an actual precision value
   def measurePrecision(work: => Boolean, expectedResult: Boolean): Unit = if work == expectedResult then println(true) else println(false) 
 }
+
+
+class PrimeRunner {
+
+
+  def run(threads: Int): Unit = {
+
+    val pr = new Prime()
+    val br = new Benchmark()
+
+    /*
+     * test cases
+     *
+     * 7919 true
+     * 2147483647 false
+     */
+
+    val time = pr.run(7919, true)
+    println(time)
+
+  } 
+}
+
diff --git a/src/Traits/Workload.scala b/src/main/scala/main/Traits/Workload.scala
index b547a6f..5fd8527 100644
--- a/src/Traits/Workload.scala
+++ b/src/main/scala/main/Traits/Workload.scala
@@ -1,4 +1,10 @@
-package com.nsrddyn.Traits
+package main.Traits
+
+import zio._
+
+enum Status:
+  case PASS 
+  case FAIL 
 
 trait Workload {