diff --git a/src/flow/doc/states.dot b/share/doc/states/service.dot
similarity index 100%
rename from src/flow/doc/states.dot
rename to share/doc/states/service.dot
diff --git a/src/flow/examples/none.json b/share/examples/oneflow/none.json
similarity index 100%
rename from src/flow/examples/none.json
rename to share/examples/oneflow/none.json
diff --git a/src/flow/examples/scal.json b/share/examples/oneflow/scal.json
similarity index 100%
rename from src/flow/examples/scal.json
rename to share/examples/oneflow/scal.json
diff --git a/src/flow/examples/straight.json b/share/examples/oneflow/straight.json
similarity index 100%
rename from src/flow/examples/straight.json
rename to share/examples/oneflow/straight.json
diff --git a/src/flow/client/bin/appflow b/src/flow/Client/bin/appflow
similarity index 100%
rename from src/flow/client/bin/appflow
rename to src/flow/Client/bin/appflow
diff --git a/src/flow/client/bin/appflow-template b/src/flow/Client/bin/appflow-template
similarity index 100%
rename from src/flow/client/bin/appflow-template
rename to src/flow/Client/bin/appflow-template
diff --git a/src/flow/client/lib/appflow_client.rb b/src/flow/Client/lib/appflow_client.rb
similarity index 100%
rename from src/flow/client/lib/appflow_client.rb
rename to src/flow/Client/lib/appflow_client.rb
diff --git a/src/flow/README b/src/flow/README
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/flow/bin/appflow-server b/src/flow/Server/bin/appflow-server
similarity index 100%
rename from src/flow/bin/appflow-server
rename to src/flow/Server/bin/appflow-server
diff --git a/src/flow/config/appflow-server.conf b/src/flow/Server/etc/appflow-server.conf
similarity index 100%
rename from src/flow/config/appflow-server.conf
rename to src/flow/Server/etc/appflow-server.conf
diff --git a/src/flow/lcm/LifeCycleManager.rb b/src/flow/Server/lib/LifeCycleManager.rb
similarity index 100%
rename from src/flow/lcm/LifeCycleManager.rb
rename to src/flow/Server/lib/LifeCycleManager.rb
diff --git a/src/flow/lib/grammar.rb b/src/flow/Server/lib/grammar.rb
similarity index 100%
rename from src/flow/lib/grammar.rb
rename to src/flow/Server/lib/grammar.rb
diff --git a/src/flow/lib/grammar.treetop b/src/flow/Server/lib/grammar.treetop
similarity index 100%
rename from src/flow/lib/grammar.treetop
rename to src/flow/Server/lib/grammar.treetop
diff --git a/src/flow/lib/log.rb b/src/flow/Server/lib/log.rb
similarity index 100%
rename from src/flow/lib/log.rb
rename to src/flow/Server/lib/log.rb
diff --git a/src/flow/lcm/strategy.rb b/src/flow/Server/lib/strategy.rb
similarity index 100%
rename from src/flow/lcm/strategy.rb
rename to src/flow/Server/lib/strategy.rb
diff --git a/src/flow/lcm/strategy/straight.rb b/src/flow/Server/lib/strategy/straight.rb
similarity index 100%
rename from src/flow/lcm/strategy/straight.rb
rename to src/flow/Server/lib/strategy/straight.rb
diff --git a/src/flow/lib/validator.rb b/src/flow/Server/lib/validator.rb
similarity index 100%
rename from src/flow/lib/validator.rb
rename to src/flow/Server/lib/validator.rb
diff --git a/src/flow/controllers/appflow-server.rb b/src/flow/appflow-server.rb
similarity index 100%
rename from src/flow/controllers/appflow-server.rb
rename to src/flow/appflow-server.rb
diff --git a/src/flow/client/.DS_Store b/src/flow/client/.DS_Store
deleted file mode 100644
index 5008ddfcf5..0000000000
Binary files a/src/flow/client/.DS_Store and /dev/null differ
diff --git a/src/flow/models.rb b/src/flow/models.rb
deleted file mode 100644
index fc69cca574..0000000000
--- a/src/flow/models.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# -------------------------------------------------------------------------- #
-# Copyright 2010-2013, C12G Labs S.L.                                        #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-require 'opennebula'
-
-include OpenNebula
-
-require 'opennebula/document_json'
-require 'opennebula/document_pool_json'
-
-require 'validator'
-
-require 'models/Role'
-require 'models/Service'
-require 'models/ServicePool'
-require 'models/ServiceTemplate'
-require 'models/ServiceTemplatePool'
diff --git a/src/flow/models/Role.rb b/src/oca/ruby/opennebula/Role.rb
similarity index 100%
rename from src/flow/models/Role.rb
rename to src/oca/ruby/opennebula/Role.rb
diff --git a/src/flow/models/Service.rb b/src/oca/ruby/opennebula/Service.rb
similarity index 100%
rename from src/flow/models/Service.rb
rename to src/oca/ruby/opennebula/Service.rb
diff --git a/src/flow/models/ServicePool.rb b/src/oca/ruby/opennebula/ServicePool.rb
similarity index 100%
rename from src/flow/models/ServicePool.rb
rename to src/oca/ruby/opennebula/ServicePool.rb
diff --git a/src/flow/models/ServiceTemplate.rb b/src/oca/ruby/opennebula/ServiceTemplate.rb
similarity index 100%
rename from src/flow/models/ServiceTemplate.rb
rename to src/oca/ruby/opennebula/ServiceTemplate.rb
diff --git a/src/flow/models/ServiceTemplatePool.rb b/src/oca/ruby/opennebula/ServiceTemplatePool.rb
similarity index 100%
rename from src/flow/models/ServiceTemplatePool.rb
rename to src/oca/ruby/opennebula/ServiceTemplatePool.rb