More import fixes.

hybrid_server/server.xml

@@ -21,10 +21,10 @@
         from collections import defaultdict
         sys.path.append("../kernel/")
         sys.path.append("../state/")
-        from kernel.modelverse_kernel.primitives import SleepKernel
-        from kernel.modelverse_kernel.main import ModelverseKernel
-        from kernel.modelverse_kernel.legacy import ModelverseKernel as LegacyModelverseKernel
-        from kernel.modelverse_kernel.generated import ModelverseKernel as GeneratedModelverseKernel
+        from modelverse_kernel.primitives import SleepKernel
+        from modelverse_kernel.main import ModelverseKernel
+        from modelverse_kernel.legacy import ModelverseKernel as LegacyModelverseKernel
+        from modelverse_kernel.generated import ModelverseKernel as GeneratedModelverseKernel
         from modelverse_state.main import ModelverseState
         #from modelverse_state.rdf import ModelverseState
         import modelverse_jit.jit as jit

interface/HUTN/test/constructor_compilation_action_language/test_compile.py

@@ -5,7 +5,7 @@ try:
 except ImportError:
     import test.constructor_compilation_action_language.util as util
 
-from compiler import main
+from hutn_compiler.compiler import main
 import json
 
 def compile_file(obj, filename):

interface/HUTN/test/grammar_action_language/test_invalids.py

@@ -5,7 +5,7 @@ try:
 except ImportError:
     import test.grammar_action_language.util as util
 
-from compiler import main
+from hutn_compiler.compiler import main
 
 def parse_file(filename):
     try:

interface/HUTN/test/grammar_action_language/test_valids.py

@@ -5,7 +5,7 @@ try:
 except ImportError:
     import test.grammar_action_language.util as util
 
-from compiler import main
+from hutn_compiler.compiler import main
 
 def parse_file(filename):
     main(util.get_code_path(filename), "grammars/actionlanguage.g", "N", [])

interface/HUTN/test/modelling_language/test_compile.py

@@ -4,7 +4,7 @@ try:
 except ImportError:
     import test.modelling_language.util as util
 
-from compiler import main
+from hutn_compiler.compiler import main
 import json
 
 def compile_file(obj, filename):