diff --git a/src/oca/ec2/OcaConfiguration.rb b/src/cloud/ec2/OcaConfiguration.rb
similarity index 100%
rename from src/oca/ec2/OcaConfiguration.rb
rename to src/cloud/ec2/OcaConfiguration.rb
diff --git a/src/oca/ec2/eco.rb b/src/cloud/ec2/eco.rb
similarity index 100%
rename from src/oca/ec2/eco.rb
rename to src/cloud/ec2/eco.rb
diff --git a/src/oca/ec2/econe-describe-images b/src/cloud/ec2/econe-describe-images
similarity index 100%
rename from src/oca/ec2/econe-describe-images
rename to src/cloud/ec2/econe-describe-images
diff --git a/src/oca/ec2/econe-describe-instances b/src/cloud/ec2/econe-describe-instances
similarity index 100%
rename from src/oca/ec2/econe-describe-instances
rename to src/cloud/ec2/econe-describe-instances
diff --git a/src/oca/ec2/econe-register b/src/cloud/ec2/econe-register
similarity index 100%
rename from src/oca/ec2/econe-register
rename to src/cloud/ec2/econe-register
diff --git a/src/oca/ec2/econe-run-instances b/src/cloud/ec2/econe-run-instances
similarity index 100%
rename from src/oca/ec2/econe-run-instances
rename to src/cloud/ec2/econe-run-instances
diff --git a/src/oca/ec2/econe-server b/src/cloud/ec2/econe-server
similarity index 100%
rename from src/oca/ec2/econe-server
rename to src/cloud/ec2/econe-server
diff --git a/src/oca/ec2/econe-terminate-instances b/src/cloud/ec2/econe-terminate-instances
similarity index 100%
rename from src/oca/ec2/econe-terminate-instances
rename to src/cloud/ec2/econe-terminate-instances
diff --git a/src/oca/ec2/econe-upload b/src/cloud/ec2/econe-upload
similarity index 100%
rename from src/oca/ec2/econe-upload
rename to src/cloud/ec2/econe-upload
diff --git a/src/oca/ec2/lib/EC2QueryClient.rb b/src/cloud/ec2/lib/EC2QueryClient.rb
similarity index 100%
rename from src/oca/ec2/lib/EC2QueryClient.rb
rename to src/cloud/ec2/lib/EC2QueryClient.rb
diff --git a/src/oca/ec2/oca.conf b/src/cloud/ec2/oca.conf
similarity index 100%
rename from src/oca/ec2/oca.conf
rename to src/cloud/ec2/oca.conf
diff --git a/src/oca/ec2/templates/m1.small.erb b/src/cloud/ec2/templates/m1.small.erb
similarity index 100%
rename from src/oca/ec2/templates/m1.small.erb
rename to src/cloud/ec2/templates/m1.small.erb
diff --git a/src/oca/rm/image.rb b/src/cloud/rm/image.rb
similarity index 100%
rename from src/oca/rm/image.rb
rename to src/cloud/rm/image.rb
diff --git a/src/oca/rm/repo_manager.rb b/src/cloud/rm/repo_manager.rb
similarity index 100%
rename from src/oca/rm/repo_manager.rb
rename to src/cloud/rm/repo_manager.rb