diff --git a/isse/org.osate.isse.verificationmethods/.classpath b/isse/org.osate.isse.verificationmethods/.classpath
index 3cc0108..eca7bdb 100644
--- a/isse/org.osate.isse.verificationmethods/.classpath
+++ b/isse/org.osate.isse.verificationmethods/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/awas.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/isse/org.osate.isse.verificationmethods/META-INF/MANIFEST.MF b/isse/org.osate.isse.verificationmethods/META-INF/MANIFEST.MF
index ac46fa7..f1673eb 100644
--- a/isse/org.osate.isse.verificationmethods/META-INF/MANIFEST.MF
+++ b/isse/org.osate.isse.verificationmethods/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.osate.isse.verificationmethods.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.osate.pluginsupport;bundle-version="1.0.0",
- org.sireum.aadl.osate;bundle-version="1.0.0"
+ org.sireum.aadl.osate;bundle-version="1.0.0",
+ org.sireum.aadl.osate.awas;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: edu.cmu.sei.isse.awasmethods
 Bundle-ActivationPolicy: lazy
diff --git a/isse/org.osate.isse.verificationmethods/lib/awas.jar b/isse/org.osate.isse.verificationmethods/lib/awas.jar
deleted file mode 100644
index e454ee1..0000000
Binary files a/isse/org.osate.isse.verificationmethods/lib/awas.jar and /dev/null differ
diff --git a/isse/org.osate.isse.verificationmethods/src/org/osate/isse/verificationmethods/AwasMethods.java b/isse/org.osate.isse.verificationmethods/src/org/osate/isse/verificationmethods/AwasMethods.java
index 175f6e4..8429a06 100644
--- a/isse/org.osate.isse.verificationmethods/src/org/osate/isse/verificationmethods/AwasMethods.java
+++ b/isse/org.osate.isse.verificationmethods/src/org/osate/isse/verificationmethods/AwasMethods.java
@@ -47,9 +47,9 @@
 import org.sireum.awas.ast.Model;
 import org.sireum.awas.awasfacade.AwasGraphImpl;
 import org.sireum.awas.awasfacade.Collector;
-import org.sireum.awas.fptc.FlowEdge;
-import org.sireum.awas.fptc.FlowGraph;
-import org.sireum.awas.fptc.FlowNode;
+import org.sireum.awas.flow.FlowEdge;
+import org.sireum.awas.flow.FlowGraph;
+import org.sireum.awas.flow.FlowNode;
 import org.sireum.awas.symbol.SymbolTable;
 import org.sireum.util.ConsoleTagReporter;