diff --git a/src/flow/Client/lib/oneflow_client.rb b/src/cli/one_helper/oneflow_client.rb similarity index 100% rename from src/flow/Client/lib/oneflow_client.rb rename to src/cli/one_helper/oneflow_client.rb diff --git a/src/flow/Client/bin/oneflow b/src/cli/oneflow similarity index 100% rename from src/flow/Client/bin/oneflow rename to src/cli/oneflow diff --git a/src/flow/Client/bin/oneflow-template b/src/cli/oneflow-template similarity index 100% rename from src/flow/Client/bin/oneflow-template rename to src/cli/oneflow-template diff --git a/src/flow/Server/bin/oneflow-server b/src/flow/bin/oneflow-server similarity index 100% rename from src/flow/Server/bin/oneflow-server rename to src/flow/bin/oneflow-server diff --git a/src/flow/Server/etc/oneflow-server.conf b/src/flow/etc/oneflow-server.conf similarity index 100% rename from src/flow/Server/etc/oneflow-server.conf rename to src/flow/etc/oneflow-server.conf diff --git a/src/flow/Server/lib/LifeCycleManager.rb b/src/flow/lib/LifeCycleManager.rb similarity index 100% rename from src/flow/Server/lib/LifeCycleManager.rb rename to src/flow/lib/LifeCycleManager.rb diff --git a/src/flow/Server/lib/grammar.rb b/src/flow/lib/grammar.rb similarity index 100% rename from src/flow/Server/lib/grammar.rb rename to src/flow/lib/grammar.rb diff --git a/src/flow/Server/lib/grammar.treetop b/src/flow/lib/grammar.treetop similarity index 100% rename from src/flow/Server/lib/grammar.treetop rename to src/flow/lib/grammar.treetop diff --git a/src/flow/Server/lib/log.rb b/src/flow/lib/log.rb similarity index 100% rename from src/flow/Server/lib/log.rb rename to src/flow/lib/log.rb diff --git a/src/flow/Server/lib/strategy.rb b/src/flow/lib/strategy.rb similarity index 100% rename from src/flow/Server/lib/strategy.rb rename to src/flow/lib/strategy.rb diff --git a/src/flow/Server/lib/strategy/straight.rb b/src/flow/lib/strategy/straight.rb similarity index 100% rename from src/flow/Server/lib/strategy/straight.rb rename to src/flow/lib/strategy/straight.rb diff --git a/src/flow/Server/lib/validator.rb b/src/flow/lib/validator.rb similarity index 100% rename from src/flow/Server/lib/validator.rb rename to src/flow/lib/validator.rb