deleted:    bench/bench-conf-default.xml
	modified:   build.xml
	new file:   common/DispMeter.java
	new file:   common/ParseUtils.java
	renamed:    src/ExprUtils/build.xml -> exprutils/build.xml
	renamed:    src/ExprUtils/example/example-plan.xml -> exprutils/example/example-plan.xml
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/Distribution.java -> exprutils/src/exprutils/Distribution.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/Executable.java -> exprutils/src/exprutils/Executable.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/Executables.java -> exprutils/src/exprutils/Executables.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/InputExecutables.java -> exprutils/src/exprutils/InputExecutables.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/JobExecutables.java -> exprutils/src/exprutils/JobExecutables.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/Plan.java -> exprutils/src/exprutils/Plan.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/Rule.java -> exprutils/src/exprutils/Rule.java
	renamed:    bench/micro/DataGen.java -> exprutils/src/exprutils/lib/input/IntRecordsGen.java
	new file:   exprutils/src/exprutils/lib/input/MultiMapperGenerator.java
	new file:   exprutils/src/exprutils/lib/input/WordCountDocGen.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/lib/rule/ArgsSemiColonSplit.java -> exprutils/src/exprutils/lib/rule/ArgsSemiColonSplit.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/lib/rule/CloneJobSplit.java -> exprutils/src/exprutils/lib/rule/CloneJobSplit.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/lib/rule/IdentityRule.java -> exprutils/src/exprutils/lib/rule/IdentityRule.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/lib/rule/PoissonJTime.java -> exprutils/src/exprutils/lib/rule/PoissonJTime.java
	renamed:    src/ExprUtils/src/edu/pdcl/mrio/exprutils/lib/rule/RandDistNumMapsSplit.java -> exprutils/src/exprutils/lib/rule/RandDistNumMapsSplit.java
	deleted:    src/ExprUtils/src/edu/pdcl/mrio/Configurable.java
	deleted:    src/ExprUtils/src/edu/pdcl/mrio/Configuration.java
	deleted:    src/ExprUtils/src/edu/pdcl/mrio/ReflectionUtils.java
	deleted:    src/ExprUtils/src/edu/pdcl/mrio/StringUtils.java
	renamed:    src/Diffundere/build.xml -> src/diffundere/build.xml
	renamed:    src/Diffundere/src/core/org/apache/hadoop/fs/BlockLocation.java -> src/diffundere/src/core/org/apache/hadoop/fs/BlockLocation.java
	renamed:    src/Diffundere/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java -> src/diffundere/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/Child.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/Child.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/DeleteBlockAction.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/DeleteBlockAction.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/JobInProgress.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/JobTracker.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/JobTracker.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/Task.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/Task.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/TaskTracker.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/TaskTrackerAction.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/TaskTrackerAction.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
	renamed:    src/Diffundere/src/diffundere/org/apache/hadoop/diffundere/AlwaysCacheDecider.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/AlwaysCacheDecider.java
	renamed:    src/Diffundere/src/diffundere/org/apache/hadoop/diffundere/CacheDecider.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/CacheDecider.java
	renamed:    src/Diffundere/src/diffundere/org/apache/hadoop/diffundere/DiffundereManager.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/DiffundereManager.java
	renamed:    src/Diffundere/src/diffundere/org/apache/hadoop/diffundere/NoCacheDecider.java -> src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/NoCacheDecider.java
	renamed:    src/Diffundere/src/diffundere/org/apache/hadoop/diffundere/changes.txt -> src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/changes.txt
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/InputSplit.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/InputSplit.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileSplit.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileSplit.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/split/JobSplit.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/split/JobSplit.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/split/JobSplitWriter.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/split/JobSplitWriter.java
	renamed:    src/Diffundere/src/mapred/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java -> src/diffundere/src/mapred/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java
	renamed:    src/HCache/build.xml -> src/hcache/build.xml
	renamed:    src/HCache/hcache-default.xml -> src/hcache/hcache-default.xml
	renamed:    src/HCache/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/BlockMetadataHeader.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/BlockMetadataHeader.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/BlockReport.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/BlockReport.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/BlockReportListener.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/BlockReportListener.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/BlockTransferThrottler.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/BlockTransferThrottler.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/BlockXceiver.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/BlockXceiver.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/CommandHandler.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/CommandHandler.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/CommandHandlerServer.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/CommandHandlerServer.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/DatanodeBlockInfo.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/DatanodeBlockInfo.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/FSDatasetAsyncDiskService.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/FSDatasetAsyncDiskService.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/FSDatasetInterface.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/FSDatasetInterface.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheBlock.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheBlock.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheBlockReader.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheBlockReader.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheConstants.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheConstants.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheController.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheController.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheControllerInstrumentation.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheControllerInstrumentation.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheControllerMXBean.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheControllerMXBean.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheDataset.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheDataset.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheManager.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheManager.java
	renamed:    src/HCache/src/hcache/org/apache/hadoop/hcache/HCacheTransferProtocol.java -> src/hcache/src/hdfs/org/apache/hadoop/hdfs/hcache/HCacheTransferProtocol.java
	modified:   test/TestHCacheClient.java
	modified:   test/TestHCacheCmd.java
	deleted:    test/TestUtils.java