diff --git a/org.ntlab.traceCollector/.classpath b/org.ntlab.traceCollector/.classpath
index b1ca03a..0b5ec0f 100644
--- a/org.ntlab.traceCollector/.classpath
+++ b/org.ntlab.traceCollector/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="javassist.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="javassist.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.ntlab.traceCollector/META-INF/MANIFEST.MF b/org.ntlab.traceCollector/META-INF/MANIFEST.MF
index 8cc08ca..34a0c53 100644
--- a/org.ntlab.traceCollector/META-INF/MANIFEST.MF
+++ b/org.ntlab.traceCollector/META-INF/MANIFEST.MF
@@ -14,3 +14,5 @@
  com.ibm.icu
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: javassist.jar,
+ .
diff --git a/org.ntlab.traceCollector/build.properties b/org.ntlab.traceCollector/build.properties
index 41eb6ad..b0bdfe1 100644
--- a/org.ntlab.traceCollector/build.properties
+++ b/org.ntlab.traceCollector/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               javassist.jar
diff --git a/org.ntlab.traceCollector/plugin.xml b/org.ntlab.traceCollector/plugin.xml
index 9117c11..1821ea1 100644
--- a/org.ntlab.traceCollector/plugin.xml
+++ b/org.ntlab.traceCollector/plugin.xml
@@ -1,6 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.6"?>
 <plugin>
+	<!-- プロジェクト全体に対してインストゥルメンテーションを行う -->
+	<extension
+			point="org.eclipse.ui.commands">
+		<category
+				name="Analyzer Category"
+				id="org.ntlab.traceCollector.commands.category">
+		</category>
+		<command
+				name="Instrumentation Command"
+				categoryId="org.ntlab.traceCollector.commands.category"
+				id="org.ntlab.traceCollector.commands.instrumentation">
+		</command>
+	</extension>
+	<extension
+			point="org.eclipse.ui.handlers">
+		<handler
+				commandId="org.ntlab.traceCollector.commands.instrumentation"
+				class="org.ntlab.traceCollector.handlers.InstrumentationHandler">
+		</handler>
+	</extension>
+	<extension
+			point="org.eclipse.ui.menus">
+		<menuContribution
+				locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+			<command
+					commandId="org.ntlab.traceCollector.commands.instrumentation"
+					id="org.ntlab.traceCollector.menus.instrumentation"
+					label="Instrumentation">
+				<visibleWhen>
+					<with
+							variable="selection">
+						<iterate>
+							<adapt
+								type="org.eclipse.core.resources.IProject">
+							</adapt>
+						</iterate>
+					</with>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	
+	<!-- ロード時にトレーサを埋め込んで実行 -->
 	<extension
 		point="org.eclipse.debug.ui.launchShortcuts">
 		<shortcut
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
index 32f782b..caa64f9 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
@@ -17,6 +17,12 @@
 
 import com.ibm.icu.text.MessageFormat;
 
+/**
+ * �g���[�X�o�͕t���őI�������v���O���������s����R�}���h
+ * 
+ * @author Nitta
+ *
+ */
 public class TracerLaunchConfigurationDelegate extends org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate {
 	@Override
 	public void launch(ILaunchConfiguration configuration, String mode,
@@ -61,22 +67,23 @@
 				classpath = new String[configClasspath.length + 2];
 				System.arraycopy(configClasspath, 0, classpath, 0, configClasspath.length);
 				classpath[configClasspath.length]		= bundlePath.substring(16) + "bin/";
-				classpath[configClasspath.length + 1]	= bundlePath.substring(16) + "javassist.jar";
+				classpath[configClasspath.length + 1]	= bundlePath.substring(16) + Tracer.JAVASSIST_LIBRARY;
 			} else {
 				classpath = configClasspath;
 			}
 			
 			// VM argments
 			String[] configVmArgs = execArgs.getVMArgumentsArray();
-			String[] vmArgs2 = new String[configVmArgs.length + 1];
-			System.arraycopy(configVmArgs, 0, vmArgs2, 0, configVmArgs.length);
-			vmArgs2[configVmArgs.length] = "-Djava.system.class.loader=" + Tracer.TRACER + "TracerClassLoader";
+//			String[] vmArgs2 = new String[configVmArgs.length + 1];
+//			System.arraycopy(configVmArgs, 0, vmArgs2, 0, configVmArgs.length);
+//			vmArgs2[configVmArgs.length] = "-Djava.system.class.loader=" + Tracer.TRACER + "TracerClassLoader";
 			
 			// Create VM config
 			VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
 			runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
 			runConfig.setEnvironment(envp);
-			runConfig.setVMArguments(vmArgs2);
+			runConfig.setVMArguments(configVmArgs);
+//			runConfig.setVMArguments(vmArgs2);
 			runConfig.setWorkingDirectory(workingDirName);
 			runConfig.setVMSpecificAttributesMap(vmAttributesMap);
 	
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
new file mode 100644
index 0000000..fafbaca
--- /dev/null
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
@@ -0,0 +1,69 @@
+package org.ntlab.traceCollector.handlers;
+
+import javassist.ClassPool;
+import javassist.CodeConverter;
+import javassist.NotFoundException;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.ntlab.traceCollector.Activator;
+import org.ntlab.traceCollector.tracer.JSONTraceGenerator;
+import org.ntlab.traceCollector.tracer.OutputStatementsGenerator;
+import org.ntlab.traceCollector.tracer.Tracer;
+
+/**
+ * �I�������v���W�F�N�g�ɃC���X�g�D�������e�[�V�������s���R�}���h
+ * 
+ * @author Nitta
+ *
+ */
+public class InstrumentationHandler extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection = HandlerUtil.getActiveMenuSelection(event);
+		if (selection instanceof IStructuredSelection) {
+			Object project = ((IStructuredSelection)selection).getFirstElement();
+			if (project instanceof IJavaProject) {
+				IJavaProject javaProject = (IJavaProject)project;
+				try {
+					// Javassist �� ClassPool �� Javassist ���C�u�������A����т��̃v���O�C�����̃N���X�����‚�����悤�ɂ���
+					ClassPool cp = ClassPool.getDefault();
+					String bundlePath = Activator.getDefault().getBundle().getLocation();
+					if (bundlePath.startsWith("reference:file:/")) {
+						cp.appendClassPath(bundlePath.substring(16) + "bin/");
+						cp.appendClassPath(bundlePath.substring(16) + Tracer.JAVASSIST_LIBRARY);
+					}
+					// Javassist �� ClassPool �� �Ώۃv���O�������̃N���X�����‚�����悤�ɂ���
+					String projectLocation = javaProject.getProject().getLocation().toString();
+					String projectPath = javaProject.getPath().toString();
+					String outputPath = javaProject.getOutputLocation().toString();
+					if (outputPath.startsWith(projectPath)) {
+						outputPath = outputPath.substring(projectPath.length());
+					}
+					System.out.println(projectLocation);
+					System.out.println(projectPath);
+					System.out.println(outputPath);
+					String classPath = projectLocation + outputPath;
+					cp.appendClassPath(classPath);
+					
+					// �C���X�g�D�������e�[�V�������s��
+					if (!Tracer.isInitialized()) {
+						Tracer.initialize(new OutputStatementsGenerator(new JSONTraceGenerator()), cp);		// �����ŏo�̓t�H�[�}�b�g���w�肷��		
+					}
+					Tracer.packageInstrumentation("", classPath + "/");
+				} catch (JavaModelException | NotFoundException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
index 2f7453d..f3f9b45 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
@@ -32,32 +32,50 @@
 public class Tracer {
 	public static int lineNo = 1;
 	public static final String TRACER = "org.ntlab.traceCollector.tracer.";
+	public static final String JAVASSIST_LIBRARY = "javassist.jar";
 	private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
-	private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack |java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
+	private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
 	private static final String EXCEPT_FOR_METHODS = "java.lang.Thread.currentThread..|java.lang.Thread.getId..";
 	private static final String STANDARD_LIB = "java.";
 	private static OutputStatementsGenerator outputStatementsGenerator = null;
-	private static CodeConverter conv = new CodeConverter();
+	private static ClassPool cp = null;
+	private static CodeConverter conv = null;
 
 	public static void main(String[] args) {
 		initialize(new OutputStatementsGenerator(new JSONTraceGenerator()));		// �����ŏo�̓t�H�[�}�b�g���w�肷��		
-		packageInstrumentation("worstCase");										// �w�肵���p�b�P�[�W�����̑S�N���X�ɃC���X�g�D�������e�[�V�������s��
+		ClassLoader loader = Thread.currentThread().getContextClassLoader();
+		URL resource = loader.getResource("");
+		try {
+			String classPath = URLDecoder.decode(resource.getPath(), "UTF-8");
+			packageInstrumentation("worstCase", classPath);							// �w�肵���p�b�P�[�W���̑S�N���X�ɃC���X�g�D�������e�[�V�������s��
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		} 
 	}
-
+	
 	/**
 	 * �o�͕���������w�肵�ăC���X�g�D�������e�[�V�����̏��������s��
 	 * 
 	 * @param outputStatementsGenerator �o�͕�������(�o�̓t�H�[�}�b�g���w��ł���)
 	 */
 	public static void initialize(OutputStatementsGenerator outputStatementsGenerator) {
-		// �z��ւ̃A�N�Z�X�̌��o
+		initialize(outputStatementsGenerator, ClassPool.getDefault());
+	}
+
+	/**
+	 * �o�͕���������w�肵�ăC���X�g�D�������e�[�V�����̏��������s��
+	 * 
+	 * @param outputStatementsGenerator �o�͕�������(�o�̓t�H�[�}�b�g���w��ł���)
+	 * @param cp Javassist�̃N���X�v�[��
+	 */
+	public static void initialize(OutputStatementsGenerator outputStatementsGenerator, ClassPool cp) {
+		// �z��ւ̃A�N�Z�X�̌��o]
+		Tracer.cp = cp;
 		Tracer.outputStatementsGenerator = outputStatementsGenerator;	// �����ŏo�̓t�H�[�}�b�g���w�肷��
+		Tracer.conv = new CodeConverter();
 		if (!(Tracer.outputStatementsGenerator.getGenerator() instanceof PlainTextTraceGenerator)) {
-			// 
-			ClassPool cp = ClassPool.getDefault();
-			CtClass cc;
 			try {
-				cc = cp.get(TRACER + "JSONArrayAdvisor");			// JSON�̏ꍇ�̂ݔz��A�N�Z�X���o�͂���
+				CtClass cc = cp.get(TRACER + "JSONArrayAdvisor");		// JSON�̏ꍇ�̂ݔz��A�N�Z�X���o�͂���
 				conv.replaceArrayAccess(cc, new CodeConverter.DefaultArrayAccessReplacementMethodNames());
 			} catch (NotFoundException e1) {
 				e1.printStackTrace();
@@ -70,28 +88,25 @@
 	 * @return �������ς�: true, ����ȊO: false
 	 */
 	public static boolean isInitialized() {
-		return (outputStatementsGenerator != null);
+		return (outputStatementsGenerator != null) && (cp != null) && (conv != null);
 	}
 
 	/**
 	 * �w�肵���p�b�P�[�W���̃N���X�ɃC���X�g�D�������e�[�V�������s��
 	 * 
 	 * @param packageName �p�b�P�[�W��
+	 * @param classPath �o�͂���N���X�t�@�C���̃N���X�p�X(null �̏ꍇ�͏o�͂��Ȃ�)
 	 */
-	public static void packageInstrumentation(String packageName) {
-		ClassLoader loader = Thread.currentThread().getContextClassLoader();
-		URL resource = loader.getResource(packageName);
+	public static void packageInstrumentation(String packageName, String classPath) {
 		File dir;
-		try {
-			dir = new File(URLDecoder.decode(resource.getPath(), "UTF-8"));
-			for (String file : dir.list()) {
-				if (file.endsWith(".class")) {
-					String className = packageName + "." + file.replace(".class", "");
-					classInstrumentation(className);
-				}
+		dir = new File(classPath + packageName.replace(".", "/"));
+		for (File file : dir.listFiles()) {
+			if (file.isFile() && file.getName().endsWith(".class")) {
+				String className = packageName + file.getName().replace(".class", "");
+				classInstrumentation(className, classPath);
+			} else if (file.isDirectory()) {
+				packageInstrumentation(packageName + file.getName() + ".", classPath);
 			}
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
 		}
 	}
 
@@ -99,13 +114,12 @@
 	 * �w�肵���N���X�ɃC���X�g�D�������e�[�V�������s��
 	 * 
 	 * @param className �N���X��
+	 * @param classPath �o�͂���N���X�t�@�C���̃N���X�p�X(null �̏ꍇ�͏o�͂��Ȃ�)
 	 */
-	public static void classInstrumentation(String className) {
-		ClassPool cp = ClassPool.getDefault();
-		CtClass cc;
+	public static void classInstrumentation(String className, String classPath) {
 		try {
-			cc = cp.get(className);
-			classInstrumentation(cc);
+			CtClass cc = cp.get(className);
+			classInstrumentation(cc, classPath);
 		} catch (NotFoundException | BadBytecode | CannotCompileException | IOException e) {
 			e.printStackTrace();
 		}
@@ -115,8 +129,9 @@
 	 * �w�肵���N���X�ɃC���X�g�D�������e�[�V�������s��
 	 * 
 	 * @param cc Javassist�̃N���X�I�u�W�F�N�g
+	 * @param classPath �o�͂���N���X�t�@�C���̃N���X�p�X(null �̏ꍇ�͏o�͂��Ȃ�)
 	 */
-	public static void classInstrumentation(CtClass cc) throws BadBytecode, NotFoundException, CannotCompileException, IOException {
+	public static void classInstrumentation(CtClass cc, String classPath) throws BadBytecode, NotFoundException, CannotCompileException, IOException {
 		classInitializerInstrumentation(cc, cc.getClassInitializer());
 		
 		for (final CtConstructor c : cc.getDeclaredConstructors()) {
@@ -126,6 +141,12 @@
 			methodInstrumentation(cc, m);
 		}
 		cc.instrument(conv);
+		if (classPath != null) {
+			if (classPath.endsWith("/")) {
+				classPath = classPath.substring(0, classPath.length() - 1);
+			}
+			cc.writeFile(classPath);
+		}
 	}
 
 	private static void classInitializerInstrumentation(CtClass cc, CtConstructor classInitializer) throws BadBytecode, NotFoundException, CannotCompileException {
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
index e459a71..2538b2b 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
@@ -26,7 +26,7 @@
 			CtClass cc = classPool.get(name);
 			if (!cc.isFrozen()) {
 				// �ύX�”\�ȂƂ������C���X�g�D�������e�[�V�������s��
-				Tracer.classInstrumentation(cc);
+				Tracer.classInstrumentation(cc, null);
 			}
 
 			// �����̃N���X���[�_�[���w�肵��JavaVM�̃N���X�ɕϊ�