Reorganize project with Java-like folder structure

4 files changed, 13 insertions, 6 deletions

diff --git a/src/test/scala/rsacomb/CanonicalModelSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/CanonicalModelSpec.scala
index 06602e3..376729c 100644
--- a/src/test/scala/rsacomb/CanonicalModelSpec.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/CanonicalModelSpec.scala
@@ -14,7 +14,8 @@ import tech.oxfordsemantic.jrdfox.logic.expression.Variable
 
 import scala.collection.JavaConverters._
 
-import rsacomb.util.{RDFoxHelpers, RSA}
+import uk.ac.ox.cs.rsacomb.RSAOntology
+import uk.ac.ox.cs.rsacomb.util.{RDFoxHelpers, RSA}
 
 object Ontology1_CanonicalModelSpec {
 
diff --git a/src/test/scala/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
index 66c1cae..49abd48 100644
--- a/src/test/scala/rsacomb/FilteringProgramSpecs.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
@@ -14,7 +14,8 @@ import tech.oxfordsemantic.jrdfox.Prefixes
 
 import scala.collection.JavaConverters._
 
-import rsacomb.util.RDFoxHelpers
+import uk.ac.ox.cs.rsacomb.FilteringProgram
+import uk.ac.ox.cs.rsacomb.util.RDFoxHelpers
 
 object FilteringProgramSpec {
 
diff --git a/src/test/scala/rsacomb/OWLAxiomSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLAxiomSpec.scala
index 65333f5..8aee03d 100644
--- a/src/test/scala/rsacomb/OWLAxiomSpec.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLAxiomSpec.scala
@@ -36,7 +36,8 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{
 import org.semanticweb.owlapi.model.{IRI => OWLIRI}
 import tech.oxfordsemantic.jrdfox.logic.expression.{IRI => RDFIRI}
 
-import rsacomb.util.RSA
+import uk.ac.ox.cs.rsacomb.converter.{RDFoxAxiomConverter, SkolemStrategy}
+import uk.ac.ox.cs.rsacomb.util.RSA
 
 object OWLAxiomSpec {
 
@@ -183,7 +184,7 @@ class OWLAxiomSpec extends AnyFlatSpec with Matchers with LoneElement {
   // Import required data
   import OWLAxiomSpec._
   // Implicit convertion from IRI in OWLAPI to IRI in JRDFox
-  import rsacomb.implicits.RDFox._
+  import uk.ac.ox.cs.rsacomb.implicits.RDFox._
 
   // OWLSubClassOfAxiom #1
   axiom_OWLSubClassOf1.toString should "be converted into a singleton List[Rule]" in {
diff --git a/src/test/scala/rsacomb/OWLClassSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLClassSpec.scala
index 27e0872..459fe21 100644
--- a/src/test/scala/rsacomb/OWLClassSpec.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLClassSpec.scala
@@ -33,8 +33,12 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{
   Literal
 }
 
-import rsacomb.RDFoxRuleShards
-import rsacomb.util.RSA
+import uk.ac.ox.cs.rsacomb.converter.{
+  RDFoxRuleShards,
+  RDFoxClassExprConverter,
+  SkolemStrategy
+}
+import uk.ac.ox.cs.rsacomb.util.RSA
 
 object OWLClassSpec {