diff --git a/.classpath b/.classpath
index 5a9a609f77e71fe06b7e09101d3aa5ff0b6709e6..14c2d10501d2841d6ad6604277729c7b78315c50 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-javaagent"/>
 	<classpathentry kind="src" path="src-test"/>
-	<classpathentry kind="src" path="src-jborat"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/asm-debug-all-4.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/src-jborat-c/Makefile b/src-cagent/Makefile
similarity index 100%
rename from src-jborat-c/Makefile
rename to src-cagent/Makefile
diff --git a/src-jborat-c/Makefile.local.tmpl b/src-cagent/Makefile.local.tmpl
similarity index 100%
rename from src-jborat-c/Makefile.local.tmpl
rename to src-cagent/Makefile.local.tmpl
diff --git a/src-jborat-c/jboratagent.c b/src-cagent/jboratagent.c
similarity index 100%
rename from src-jborat-c/jboratagent.c
rename to src-cagent/jboratagent.c
diff --git a/src-jborat-c/jboratagent.h b/src-cagent/jboratagent.h
similarity index 100%
rename from src-jborat-c/jboratagent.h
rename to src-cagent/jboratagent.h
diff --git a/src-jborat/ch/usi/dag/dislagent/JavaAgent.java b/src-javaagent/ch/usi/dag/dislagent/JavaAgent.java
similarity index 100%
rename from src-jborat/ch/usi/dag/dislagent/JavaAgent.java
rename to src-javaagent/ch/usi/dag/dislagent/JavaAgent.java