diff --git a/ChangeLog b/ChangeLog
index f4736c9..f47530c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Mon May 11 01:47:51 2009  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/codegenerator/CodeGenerator.java ->
+	  net/loveruby/cflat/sysdep
+
+	* net/loveruby/cflat/codegenerator/CodeGeneratorOptions.java ->
+	  net/loveruby/cflat/sysdep
+
+	* net/loveruby/cflat/sysdep/Platform.java: ditto.
+
+	* net/loveruby/cflat/sysdep/x86/CodeGenerator.java: ditto.
+
+	* net/loveruby/cflat/sysdep/x86/X86Linux.java: ditto.
+
+	* net/loveruby/cflat/compiler/Compiler.java: ditto.
+
+	* net/loveruby/cflat/compiler/Options.java: ditto.
+
 Mon May 11 01:40:28 2009  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/sysdep/x86/CodeGenerator.java: use
diff --git a/net/loveruby/cflat/compiler/Compiler.java b/net/loveruby/cflat/compiler/Compiler.java
index 70e14a4..94f4a5c 100644
--- a/net/loveruby/cflat/compiler/Compiler.java
+++ b/net/loveruby/cflat/compiler/Compiler.java
@@ -4,7 +4,7 @@ import net.loveruby.cflat.ast.AST;
 import net.loveruby.cflat.ast.StmtNode;
 import net.loveruby.cflat.ast.ExprNode;
 import net.loveruby.cflat.ir.IR;
-import net.loveruby.cflat.codegenerator.CodeGenerator;
+import net.loveruby.cflat.sysdep.CodeGenerator;
 import net.loveruby.cflat.utils.ErrorHandler;
 import net.loveruby.cflat.exception.*;
 import java.util.*;
diff --git a/net/loveruby/cflat/compiler/Options.java b/net/loveruby/cflat/compiler/Options.java
index d597555..92549d6 100644
--- a/net/loveruby/cflat/compiler/Options.java
+++ b/net/loveruby/cflat/compiler/Options.java
@@ -1,10 +1,9 @@
 package net.loveruby.cflat.compiler;
-import net.loveruby.cflat.sysdep.Platform;
-import net.loveruby.cflat.sysdep.x86.X86Linux;
 import net.loveruby.cflat.parser.LibraryLoader;
 import net.loveruby.cflat.type.TypeTable;
 import net.loveruby.cflat.asm.*;
-import net.loveruby.cflat.codegenerator.*;
+import net.loveruby.cflat.sysdep.*;
+import net.loveruby.cflat.sysdep.x86.X86Linux;
 import net.loveruby.cflat.utils.ErrorHandler;
 import net.loveruby.cflat.exception.*;
 import java.util.*;
diff --git a/net/loveruby/cflat/codegenerator/CodeGenerator.java b/net/loveruby/cflat/sysdep/CodeGenerator.java
similarity index 67%
rename from net/loveruby/cflat/codegenerator/CodeGenerator.java
rename to net/loveruby/cflat/sysdep/CodeGenerator.java
index c29e03a..0f92971 100644
--- a/net/loveruby/cflat/codegenerator/CodeGenerator.java
+++ b/net/loveruby/cflat/sysdep/CodeGenerator.java
@@ -1,4 +1,4 @@
-package net.loveruby.cflat.codegenerator;
+package net.loveruby.cflat.sysdep;
 
 public interface CodeGenerator {
     String generate(net.loveruby.cflat.ir.IR ir);
diff --git a/net/loveruby/cflat/codegenerator/CodeGeneratorOptions.java b/net/loveruby/cflat/sysdep/CodeGeneratorOptions.java
similarity index 96%
rename from net/loveruby/cflat/codegenerator/CodeGeneratorOptions.java
rename to net/loveruby/cflat/sysdep/CodeGeneratorOptions.java
index 36225e3..5c0fb80 100644
--- a/net/loveruby/cflat/codegenerator/CodeGeneratorOptions.java
+++ b/net/loveruby/cflat/sysdep/CodeGeneratorOptions.java
@@ -1,4 +1,4 @@
-package net.loveruby.cflat.codegenerator;
+package net.loveruby.cflat.sysdep;
 
 public class CodeGeneratorOptions {
     protected int optimizeLevel;
diff --git a/net/loveruby/cflat/sysdep/Platform.java b/net/loveruby/cflat/sysdep/Platform.java
index c81874e..0ec1404 100644
--- a/net/loveruby/cflat/sysdep/Platform.java
+++ b/net/loveruby/cflat/sysdep/Platform.java
@@ -1,7 +1,5 @@
 package net.loveruby.cflat.sysdep;
 import net.loveruby.cflat.type.TypeTable;
-import net.loveruby.cflat.codegenerator.CodeGenerator;
-import net.loveruby.cflat.codegenerator.CodeGeneratorOptions;
 import net.loveruby.cflat.utils.ErrorHandler;
 
 public interface Platform {
diff --git a/net/loveruby/cflat/sysdep/x86/CodeGenerator.java b/net/loveruby/cflat/sysdep/x86/CodeGenerator.java
index b8b07f2..fb901fe 100644
--- a/net/loveruby/cflat/sysdep/x86/CodeGenerator.java
+++ b/net/loveruby/cflat/sysdep/x86/CodeGenerator.java
@@ -1,5 +1,5 @@
 package net.loveruby.cflat.sysdep.x86;
-import net.loveruby.cflat.codegenerator.*;
+import net.loveruby.cflat.sysdep.CodeGeneratorOptions;
 import net.loveruby.cflat.ir.*;
 import net.loveruby.cflat.entity.*;
 import net.loveruby.cflat.asm.*;
@@ -9,7 +9,7 @@ import net.loveruby.cflat.utils.ErrorHandler;
 import java.util.*;
 
 class CodeGenerator
-        implements net.loveruby.cflat.codegenerator.CodeGenerator,
+        implements net.loveruby.cflat.sysdep.CodeGenerator,
                 IRVisitor<Void,Void>,
                 ELFConstants {
     // #@@range/ctor{
diff --git a/net/loveruby/cflat/sysdep/x86/X86Linux.java b/net/loveruby/cflat/sysdep/x86/X86Linux.java
index 4e0277d..3b64d12 100644
--- a/net/loveruby/cflat/sysdep/x86/X86Linux.java
+++ b/net/loveruby/cflat/sysdep/x86/X86Linux.java
@@ -1,6 +1,6 @@
 package net.loveruby.cflat.sysdep.x86;
 import net.loveruby.cflat.sysdep.Platform;
-import net.loveruby.cflat.codegenerator.CodeGeneratorOptions;
+import net.loveruby.cflat.sysdep.CodeGeneratorOptions;
 import net.loveruby.cflat.utils.ErrorHandler;
 import net.loveruby.cflat.type.TypeTable;