From: Jiri Tomasek <jtomasek(a)redhat.com>
Signed-off-by: Matt Wagner <matt.wagner(a)redhat.com>
---
src/app/controllers/assemblies_controller.rb | 6 +++
.../{image_factory => }/builds_controller.rb | 2 +-
.../{image_factory => }/deployables_controller.rb | 2 +-
.../{resources => }/deployments_controller.rb | 2 +-
.../{admin => }/hardware_profiles_controller.rb | 2 +-
.../image_factory/assemblies_controller.rb | 6 ---
.../image_imports_controller.rb | 2 +-
.../{resources => }/instances_controller.rb | 2 +-
.../{admin => }/pool_families_controller.rb | 2 +-
.../{resources => }/pools_controller.rb | 2 +-
.../{admin => }/provider_accounts_controller.rb | 2 +-
.../{admin => }/providers_controller.rb | 2 +-
.../{admin => }/realm_mappings_controller.rb | 2 +-
.../controllers/{admin => }/realms_controller.rb | 2 +-
.../controllers/{admin => }/roles_controller.rb | 2 +-
.../controllers/{admin => }/settings_controller.rb | 2 +-
.../{image_factory => }/templates_controller.rb | 2 +-
.../controllers/{admin => }/users_controller.rb | 2 +-
src/app/helpers/resources/instances_helper.rb | 33 --------------------
.../{image_factory => }/assemblies/index.haml | 0
.../views/{image_factory => }/builds/index.haml | 0
.../deployables/_assemblies.haml | 0
.../deployables/_deployments.haml | 0
.../{image_factory => }/deployables/_form.haml | 0
.../{image_factory => }/deployables/_list.haml | 0
.../deployables/_pick_assemblies.haml | 0
.../deployables/_properties.haml | 0
.../{image_factory => }/deployables/edit.haml | 0
.../hardware_profiles => deployables}/index.haml | 0
.../views/{image_factory => }/deployables/new.haml | 0
.../deployables/pick_assemblies.haml | 0
.../provider_accounts => deployables}/show.haml | 0
.../{resources => }/deployments/_history.haml | 0
.../{resources => }/deployments/_instances.haml | 0
.../views/{resources => }/deployments/_list.haml | 0
.../{resources => }/deployments/_permissions.haml | 0
.../{resources => }/deployments/_properties.haml | 0
.../deployments/_provider_services.haml | 0
.../deployments/_required_services.haml | 0
.../views/{resources => }/deployments/index.haml | 0
.../{resources => }/deployments/launch_new.haml | 0
src/app/views/{resources => }/deployments/new.haml | 0
.../hardware_profiles => deployments}/show.haml | 0
.../views/{admin => }/hardware_profiles/_form.haml | 0
.../{admin => }/hardware_profiles/_history.haml | 0
.../views/{admin => }/hardware_profiles/_list.haml | 0
.../_matching_provider_hardware_profiles.haml | 0
.../{admin => }/hardware_profiles/_properties.haml | 0
.../{admin => }/hardware_profiles/create.haml | 0
.../views/{admin => }/hardware_profiles/edit.haml | 0
.../pool_families => hardware_profiles}/index.haml | 0
.../views/{admin => }/hardware_profiles/new.haml | 0
.../deployments => hardware_profiles}/show.haml | 0
.../{image_factory => }/image_imports/new.haml | 0
.../instances/_can_perform_state_change.xml.haml | 0
.../views/{resources => }/instances/_history.haml | 0
src/app/views/{resources => }/instances/_list.haml | 0
.../{resources => }/instances/_permissions.haml | 0
.../{resources => }/instances/_properties.haml | 0
.../provider_accounts => instances}/index.haml | 0
src/app/views/{resources => }/instances/new.haml | 0
.../{resources => }/instances/select_template.haml | 0
.../deployables => instances}/show.haml | 0
src/app/views/{admin => }/pool_families/_form.haml | 0
.../views/{admin => }/pool_families/_history.haml | 0
src/app/views/{admin => }/pool_families/_list.haml | 0
.../{admin => }/pool_families/_permissions.haml | 0
.../views/{admin => }/pool_families/_pools.haml | 0
.../{admin => }/pool_families/_properties.haml | 0
.../pool_families/_provider_accounts.haml | 0
src/app/views/{admin => }/pool_families/edit.haml | 0
.../{admin/providers => pool_families}/index.haml | 0
src/app/views/{admin => }/pool_families/new.haml | 0
src/app/views/{admin => }/pool_families/show.haml | 0
.../views/{resources => }/pools/_deployments.haml | 0
src/app/views/{resources => }/pools/_history.haml | 0
.../views/{resources => }/pools/_instances.haml | 0
src/app/views/{resources => }/pools/_list.haml | 0
.../views/{resources => }/pools/_permissions.haml | 0
.../views/{resources => }/pools/_properties.haml | 0
src/app/views/{resources => }/pools/edit.haml | 0
src/app/views/{admin/realms => pools}/index.haml | 0
src/app/views/{resources => }/pools/new.haml | 0
.../{image_factory/templates => pools}/show.haml | 0
.../provider_accounts/_credentials.haml | 0
.../{admin => }/provider_accounts/_history.haml | 0
.../views/{admin => }/provider_accounts/_list.haml | 0
.../provider_accounts/_permissions.haml | 0
.../{admin => }/provider_accounts/_properties.haml | 0
.../provider_accounts/_provider_form.haml | 0
.../provider_accounts/_provider_selection.haml | 0
.../{admin => }/provider_accounts/_rhevm.haml | 0
.../views/{admin => }/provider_accounts/edit.haml | 0
.../{admin/roles => provider_accounts}/index.haml | 0
.../views/{admin => }/provider_accounts/new.haml | 0
.../instances => provider_accounts}/show.haml | 0
src/app/views/{admin => }/providers/_form.haml | 0
src/app/views/{admin => }/providers/_history.haml | 0
.../views/{admin => }/providers/_hw_profiles.haml | 0
src/app/views/{admin => }/providers/_list.haml | 0
.../views/{admin => }/providers/_permissions.haml | 0
.../views/{admin => }/providers/_properties.haml | 0
.../{admin => }/providers/_provider_accounts.haml | 0
src/app/views/{admin => }/providers/_realms.haml | 0
src/app/views/{admin => }/providers/_services.haml | 0
src/app/views/{admin => }/providers/edit.haml | 0
.../views/{admin/users => providers}/index.haml | 0
src/app/views/{admin => }/providers/new.haml | 0
src/app/views/{admin => }/providers/show.haml | 0
src/app/views/{admin => }/realm_mappings/new.haml | 0
src/app/views/{admin => }/realm_mappings/show.haml | 0
src/app/views/{admin => }/realms/_form.haml | 0
src/app/views/{admin => }/realms/_list.haml | 0
src/app/views/{admin => }/realms/_mapping.haml | 0
src/app/views/{admin => }/realms/_properties.haml | 0
src/app/views/{admin => }/realms/edit.haml | 0
.../deployables => realms}/index.haml | 0
src/app/views/{admin => }/realms/new.haml | 0
src/app/views/{admin => }/realms/show.haml | 0
src/app/views/{admin => }/roles/_form.haml | 0
src/app/views/{admin => }/roles/_list.haml | 0
src/app/views/{admin => }/roles/_properties.haml | 0
src/app/views/{admin => }/roles/edit.haml | 0
.../{image_factory/templates => roles}/index.haml | 0
src/app/views/{admin => }/roles/new.haml | 0
.../{admin => }/settings/general_settings.haml | 0
src/app/views/{admin => }/settings/index.haml | 0
.../views/{admin => }/settings/self_service.haml | 0
.../{image_factory => }/templates/_addbuttons.haml | 0
.../{image_factory => }/templates/_basics.haml | 0
.../{image_factory => }/templates/_builds.haml | 0
.../templates/_collections.haml | 0
.../views/{image_factory => }/templates/_form.haml | 0
.../templates/_hidden_fields.haml | 0
.../views/{image_factory => }/templates/_list.haml | 0
.../templates/_local_content_to_bundle.haml | 0
.../templates/_managed_content.haml | 0
.../templates/_metagroup_packages.haml | 0
.../{image_factory => }/templates/_metagroups.haml | 0
.../templates/_preboot_configuration.haml | 0
.../{image_factory => }/templates/_properties.haml | 0
.../templates/_search_packages.haml | 0
.../templates/_software_selection.haml | 0
.../{image_factory => }/templates/collections.haml | 0
.../views/{image_factory => }/templates/edit.haml | 0
.../{resources/instances => templates}/index.haml | 0
.../templates/managed_content.haml | 0
.../templates/metagroup_packages.haml | 0
.../views/{image_factory => }/templates/new.haml | 0
.../templates/search_packages.haml | 0
.../views/{resources/pools => templates}/show.haml | 0
src/app/views/{admin => }/users/_form.haml | 0
src/app/views/{admin => }/users/_list.haml | 0
src/app/views/{admin => }/users/_properties.haml | 0
src/app/views/{admin => }/users/edit.haml | 0
.../views/{resources/pools => users}/index.haml | 0
src/app/views/{admin => }/users/new.haml | 0
157 files changed, 22 insertions(+), 55 deletions(-)
create mode 100644 src/app/controllers/assemblies_controller.rb
rename src/app/controllers/{image_factory => }/builds_controller.rb (98%)
rename src/app/controllers/{image_factory => }/deployables_controller.rb (98%)
rename src/app/controllers/{resources => }/deployments_controller.rb (98%)
rename src/app/controllers/{admin => }/hardware_profiles_controller.rb (99%)
delete mode 100644 src/app/controllers/image_factory/assemblies_controller.rb
rename src/app/controllers/{image_factory => }/image_imports_controller.rb (91%)
rename src/app/controllers/{resources => }/instances_controller.rb (99%)
rename src/app/controllers/{admin => }/pool_families_controller.rb (98%)
rename src/app/controllers/{resources => }/pools_controller.rb (98%)
rename src/app/controllers/{admin => }/provider_accounts_controller.rb (98%)
rename src/app/controllers/{admin => }/providers_controller.rb (98%)
rename src/app/controllers/{admin => }/realm_mappings_controller.rb (95%)
rename src/app/controllers/{admin => }/realms_controller.rb (97%)
rename src/app/controllers/{admin => }/roles_controller.rb (97%)
rename src/app/controllers/{admin => }/settings_controller.rb (95%)
rename src/app/controllers/{image_factory => }/templates_controller.rb (99%)
rename src/app/controllers/{admin => }/users_controller.rb (98%)
delete mode 100644 src/app/helpers/resources/instances_helper.rb
rename src/app/views/{image_factory => }/assemblies/index.haml (100%)
rename src/app/views/{image_factory => }/builds/index.haml (100%)
rename src/app/views/{image_factory => }/deployables/_assemblies.haml (100%)
rename src/app/views/{image_factory => }/deployables/_deployments.haml (100%)
rename src/app/views/{image_factory => }/deployables/_form.haml (100%)
rename src/app/views/{image_factory => }/deployables/_list.haml (100%)
rename src/app/views/{image_factory => }/deployables/_pick_assemblies.haml (100%)
rename src/app/views/{image_factory => }/deployables/_properties.haml (100%)
rename src/app/views/{image_factory => }/deployables/edit.haml (100%)
rename src/app/views/{admin/hardware_profiles => deployables}/index.haml (100%)
rename src/app/views/{image_factory => }/deployables/new.haml (100%)
rename src/app/views/{image_factory => }/deployables/pick_assemblies.haml (100%)
rename src/app/views/{admin/provider_accounts => deployables}/show.haml (100%)
rename src/app/views/{resources => }/deployments/_history.haml (100%)
rename src/app/views/{resources => }/deployments/_instances.haml (100%)
rename src/app/views/{resources => }/deployments/_list.haml (100%)
rename src/app/views/{resources => }/deployments/_permissions.haml (100%)
rename src/app/views/{resources => }/deployments/_properties.haml (100%)
rename src/app/views/{resources => }/deployments/_provider_services.haml (100%)
rename src/app/views/{resources => }/deployments/_required_services.haml (100%)
rename src/app/views/{resources => }/deployments/index.haml (100%)
rename src/app/views/{resources => }/deployments/launch_new.haml (100%)
rename src/app/views/{resources => }/deployments/new.haml (100%)
rename src/app/views/{admin/hardware_profiles => deployments}/show.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/_form.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/_history.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/_list.haml (100%)
rename src/app/views/{admin =>
}/hardware_profiles/_matching_provider_hardware_profiles.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/_properties.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/create.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/edit.haml (100%)
rename src/app/views/{admin/pool_families => hardware_profiles}/index.haml (100%)
rename src/app/views/{admin => }/hardware_profiles/new.haml (100%)
rename src/app/views/{resources/deployments => hardware_profiles}/show.haml (100%)
rename src/app/views/{image_factory => }/image_imports/new.haml (100%)
rename src/app/views/{resources => }/instances/_can_perform_state_change.xml.haml
(100%)
rename src/app/views/{resources => }/instances/_history.haml (100%)
rename src/app/views/{resources => }/instances/_list.haml (100%)
rename src/app/views/{resources => }/instances/_permissions.haml (100%)
rename src/app/views/{resources => }/instances/_properties.haml (100%)
rename src/app/views/{admin/provider_accounts => instances}/index.haml (100%)
rename src/app/views/{resources => }/instances/new.haml (100%)
rename src/app/views/{resources => }/instances/select_template.haml (100%)
rename src/app/views/{image_factory/deployables => instances}/show.haml (100%)
rename src/app/views/{admin => }/pool_families/_form.haml (100%)
rename src/app/views/{admin => }/pool_families/_history.haml (100%)
rename src/app/views/{admin => }/pool_families/_list.haml (100%)
rename src/app/views/{admin => }/pool_families/_permissions.haml (100%)
rename src/app/views/{admin => }/pool_families/_pools.haml (100%)
rename src/app/views/{admin => }/pool_families/_properties.haml (100%)
rename src/app/views/{admin => }/pool_families/_provider_accounts.haml (100%)
rename src/app/views/{admin => }/pool_families/edit.haml (100%)
rename src/app/views/{admin/providers => pool_families}/index.haml (100%)
rename src/app/views/{admin => }/pool_families/new.haml (100%)
rename src/app/views/{admin => }/pool_families/show.haml (100%)
rename src/app/views/{resources => }/pools/_deployments.haml (100%)
rename src/app/views/{resources => }/pools/_history.haml (100%)
rename src/app/views/{resources => }/pools/_instances.haml (100%)
rename src/app/views/{resources => }/pools/_list.haml (100%)
rename src/app/views/{resources => }/pools/_permissions.haml (100%)
rename src/app/views/{resources => }/pools/_properties.haml (100%)
rename src/app/views/{resources => }/pools/edit.haml (100%)
rename src/app/views/{admin/realms => pools}/index.haml (100%)
rename src/app/views/{resources => }/pools/new.haml (100%)
rename src/app/views/{image_factory/templates => pools}/show.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_credentials.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_history.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_list.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_permissions.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_properties.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_provider_form.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_provider_selection.haml (100%)
rename src/app/views/{admin => }/provider_accounts/_rhevm.haml (100%)
rename src/app/views/{admin => }/provider_accounts/edit.haml (100%)
rename src/app/views/{admin/roles => provider_accounts}/index.haml (100%)
rename src/app/views/{admin => }/provider_accounts/new.haml (100%)
rename src/app/views/{resources/instances => provider_accounts}/show.haml (100%)
rename src/app/views/{admin => }/providers/_form.haml (100%)
rename src/app/views/{admin => }/providers/_history.haml (100%)
rename src/app/views/{admin => }/providers/_hw_profiles.haml (100%)
rename src/app/views/{admin => }/providers/_list.haml (100%)
rename src/app/views/{admin => }/providers/_permissions.haml (100%)
rename src/app/views/{admin => }/providers/_properties.haml (100%)
rename src/app/views/{admin => }/providers/_provider_accounts.haml (100%)
rename src/app/views/{admin => }/providers/_realms.haml (100%)
rename src/app/views/{admin => }/providers/_services.haml (100%)
rename src/app/views/{admin => }/providers/edit.haml (100%)
rename src/app/views/{admin/users => providers}/index.haml (100%)
rename src/app/views/{admin => }/providers/new.haml (100%)
rename src/app/views/{admin => }/providers/show.haml (100%)
rename src/app/views/{admin => }/realm_mappings/new.haml (100%)
rename src/app/views/{admin => }/realm_mappings/show.haml (100%)
rename src/app/views/{admin => }/realms/_form.haml (100%)
rename src/app/views/{admin => }/realms/_list.haml (100%)
rename src/app/views/{admin => }/realms/_mapping.haml (100%)
rename src/app/views/{admin => }/realms/_properties.haml (100%)
rename src/app/views/{admin => }/realms/edit.haml (100%)
rename src/app/views/{image_factory/deployables => realms}/index.haml (100%)
rename src/app/views/{admin => }/realms/new.haml (100%)
rename src/app/views/{admin => }/realms/show.haml (100%)
rename src/app/views/{admin => }/roles/_form.haml (100%)
rename src/app/views/{admin => }/roles/_list.haml (100%)
rename src/app/views/{admin => }/roles/_properties.haml (100%)
rename src/app/views/{admin => }/roles/edit.haml (100%)
rename src/app/views/{image_factory/templates => roles}/index.haml (100%)
rename src/app/views/{admin => }/roles/new.haml (100%)
rename src/app/views/{admin => }/settings/general_settings.haml (100%)
rename src/app/views/{admin => }/settings/index.haml (100%)
rename src/app/views/{admin => }/settings/self_service.haml (100%)
rename src/app/views/{image_factory => }/templates/_addbuttons.haml (100%)
rename src/app/views/{image_factory => }/templates/_basics.haml (100%)
rename src/app/views/{image_factory => }/templates/_builds.haml (100%)
rename src/app/views/{image_factory => }/templates/_collections.haml (100%)
rename src/app/views/{image_factory => }/templates/_form.haml (100%)
rename src/app/views/{image_factory => }/templates/_hidden_fields.haml (100%)
rename src/app/views/{image_factory => }/templates/_list.haml (100%)
rename src/app/views/{image_factory => }/templates/_local_content_to_bundle.haml
(100%)
rename src/app/views/{image_factory => }/templates/_managed_content.haml (100%)
rename src/app/views/{image_factory => }/templates/_metagroup_packages.haml (100%)
rename src/app/views/{image_factory => }/templates/_metagroups.haml (100%)
rename src/app/views/{image_factory => }/templates/_preboot_configuration.haml (100%)
rename src/app/views/{image_factory => }/templates/_properties.haml (100%)
rename src/app/views/{image_factory => }/templates/_search_packages.haml (100%)
rename src/app/views/{image_factory => }/templates/_software_selection.haml (100%)
rename src/app/views/{image_factory => }/templates/collections.haml (100%)
rename src/app/views/{image_factory => }/templates/edit.haml (100%)
rename src/app/views/{resources/instances => templates}/index.haml (100%)
rename src/app/views/{image_factory => }/templates/managed_content.haml (100%)
rename src/app/views/{image_factory => }/templates/metagroup_packages.haml (100%)
rename src/app/views/{image_factory => }/templates/new.haml (100%)
rename src/app/views/{image_factory => }/templates/search_packages.haml (100%)
rename src/app/views/{resources/pools => templates}/show.haml (100%)
rename src/app/views/{admin => }/users/_form.haml (100%)
rename src/app/views/{admin => }/users/_list.haml (100%)
rename src/app/views/{admin => }/users/_properties.haml (100%)
rename src/app/views/{admin => }/users/edit.haml (100%)
rename src/app/views/{resources/pools => users}/index.haml (100%)
rename src/app/views/{admin => }/users/new.haml (100%)
diff --git a/src/app/controllers/assemblies_controller.rb
b/src/app/controllers/assemblies_controller.rb
new file mode 100644
index 0000000..c109039
--- /dev/null
+++ b/src/app/controllers/assemblies_controller.rb
@@ -0,0 +1,6 @@
+class AssembliesController < ApplicationController
+ before_filter :require_user
+
+ def index
+ end
+end
diff --git a/src/app/controllers/image_factory/builds_controller.rb
b/src/app/controllers/builds_controller.rb
similarity index 98%
rename from src/app/controllers/image_factory/builds_controller.rb
rename to src/app/controllers/builds_controller.rb
index 58c3fa6..3572a45 100644
--- a/src/app/controllers/image_factory/builds_controller.rb
+++ b/src/app/controllers/builds_controller.rb
@@ -1,4 +1,4 @@
-class ImageFactory::BuildsController < ApplicationController
+class BuildsController < ApplicationController
before_filter [:require_user], :except => [:update_status]
def index
diff --git a/src/app/controllers/image_factory/deployables_controller.rb
b/src/app/controllers/deployables_controller.rb
similarity index 98%
rename from src/app/controllers/image_factory/deployables_controller.rb
rename to src/app/controllers/deployables_controller.rb
index 90242f3..22332f5 100644
--- a/src/app/controllers/image_factory/deployables_controller.rb
+++ b/src/app/controllers/deployables_controller.rb
@@ -1,4 +1,4 @@
-class ImageFactory::DeployablesController < ApplicationController
+class DeployablesController < ApplicationController
before_filter :require_user
before_filter :load_deployables, :only => [:index, :show, :pick_assemblies]
before_filter :load_deployable_with_assemblies, :only => [:remove_assemblies,
:add_assemblies, :pick_assemblies]
diff --git a/src/app/controllers/resources/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
similarity index 98%
rename from src/app/controllers/resources/deployments_controller.rb
rename to src/app/controllers/deployments_controller.rb
index 26287c5..8fe4cd0 100644
--- a/src/app/controllers/resources/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -1,4 +1,4 @@
-class Resources::DeploymentsController < ApplicationController
+class DeploymentsController < ApplicationController
before_filter :require_user
before_filter :load_deployments, :only => [:index, :show]
diff --git a/src/app/controllers/admin/hardware_profiles_controller.rb
b/src/app/controllers/hardware_profiles_controller.rb
similarity index 99%
rename from src/app/controllers/admin/hardware_profiles_controller.rb
rename to src/app/controllers/hardware_profiles_controller.rb
index e82580b..54f7e8f 100644
--- a/src/app/controllers/admin/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
@@ -1,4 +1,4 @@
-class Admin::HardwareProfilesController < ApplicationController
+class HardwareProfilesController < ApplicationController
before_filter :require_user, :except => :matching_profiles
before_filter :set_params_and_header, :only => [:index, :show]
before_filter :load_hardware_profiles, :only => [:index, :show]
diff --git a/src/app/controllers/image_factory/assemblies_controller.rb
b/src/app/controllers/image_factory/assemblies_controller.rb
deleted file mode 100644
index ce67f14..0000000
--- a/src/app/controllers/image_factory/assemblies_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class ImageFactory::AssembliesController < ApplicationController
- before_filter :require_user
-
- def index
- end
-end
diff --git a/src/app/controllers/image_factory/image_imports_controller.rb
b/src/app/controllers/image_imports_controller.rb
similarity index 91%
rename from src/app/controllers/image_factory/image_imports_controller.rb
rename to src/app/controllers/image_imports_controller.rb
index 45ba6d6..24d286b 100644
--- a/src/app/controllers/image_factory/image_imports_controller.rb
+++ b/src/app/controllers/image_imports_controller.rb
@@ -1,4 +1,4 @@
-class ImageFactory::ImageImportsController < ApplicationController
+class ImageImportsController < ApplicationController
before_filter :require_user
def new
diff --git a/src/app/controllers/resources/instances_controller.rb
b/src/app/controllers/instances_controller.rb
similarity index 99%
rename from src/app/controllers/resources/instances_controller.rb
rename to src/app/controllers/instances_controller.rb
index 37aadeb..42e0e01 100644
--- a/src/app/controllers/resources/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -1,4 +1,4 @@
-class Resources::InstancesController < ApplicationController
+class InstancesController < ApplicationController
before_filter :require_user, :except => [:can_start, :can_create]
before_filter :load_instance, :only => [:show, :key]
before_filter :set_view_vars, :only => [:show, :index]
diff --git a/src/app/controllers/admin/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb
similarity index 98%
rename from src/app/controllers/admin/pool_families_controller.rb
rename to src/app/controllers/pool_families_controller.rb
index fa4e03f..3d1a5fd 100644
--- a/src/app/controllers/admin/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -1,4 +1,4 @@
-class Admin::PoolFamiliesController < ApplicationController
+class PoolFamiliesController < ApplicationController
before_filter :require_user
before_filter :set_params_and_header, :only => [:index, :show]
before_filter :load_pool_families, :only =>[:show]
diff --git a/src/app/controllers/resources/pools_controller.rb
b/src/app/controllers/pools_controller.rb
similarity index 98%
rename from src/app/controllers/resources/pools_controller.rb
rename to src/app/controllers/pools_controller.rb
index 530883a..ecfff29 100644
--- a/src/app/controllers/resources/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -1,4 +1,4 @@
-class Resources::PoolsController < ApplicationController
+class PoolsController < ApplicationController
before_filter :require_user
before_filter :set_params_and_header, :only => [:index, :show]
before_filter :load_pools, :only => [:show]
diff --git a/src/app/controllers/admin/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
similarity index 98%
rename from src/app/controllers/admin/provider_accounts_controller.rb
rename to src/app/controllers/provider_accounts_controller.rb
index 01aa549..438e7ee 100644
--- a/src/app/controllers/admin/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -1,4 +1,4 @@
-class Admin::ProviderAccountsController < ApplicationController
+class ProviderAccountsController < ApplicationController
before_filter :require_user
before_filter :load_accounts, :only => :show
before_filter :set_view_vars, :only => [:index,:show]
diff --git a/src/app/controllers/admin/providers_controller.rb
b/src/app/controllers/providers_controller.rb
similarity index 98%
rename from src/app/controllers/admin/providers_controller.rb
rename to src/app/controllers/providers_controller.rb
index 16e07de..9bbbf8c 100644
--- a/src/app/controllers/admin/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -1,4 +1,4 @@
-class Admin::ProvidersController < ApplicationController
+class ProvidersController < ApplicationController
before_filter :require_user
before_filter :set_view_envs, :only => [:show, :index]
diff --git a/src/app/controllers/admin/realm_mappings_controller.rb
b/src/app/controllers/realm_mappings_controller.rb
similarity index 95%
rename from src/app/controllers/admin/realm_mappings_controller.rb
rename to src/app/controllers/realm_mappings_controller.rb
index cf84e2c..226cdf9 100644
--- a/src/app/controllers/admin/realm_mappings_controller.rb
+++ b/src/app/controllers/realm_mappings_controller.rb
@@ -1,4 +1,4 @@
-class Admin::RealmMappingsController < ApplicationController
+class RealmMappingsController < ApplicationController
before_filter :require_user
def new
diff --git a/src/app/controllers/admin/realms_controller.rb
b/src/app/controllers/realms_controller.rb
similarity index 97%
rename from src/app/controllers/admin/realms_controller.rb
rename to src/app/controllers/realms_controller.rb
index bcfd7a8..7f05ff7 100644
--- a/src/app/controllers/admin/realms_controller.rb
+++ b/src/app/controllers/realms_controller.rb
@@ -1,4 +1,4 @@
-class Admin::RealmsController < ApplicationController
+class RealmsController < ApplicationController
before_filter :require_user
before_filter :load_realms, :only =>[:index,:show]
diff --git a/src/app/controllers/admin/roles_controller.rb
b/src/app/controllers/roles_controller.rb
similarity index 97%
rename from src/app/controllers/admin/roles_controller.rb
rename to src/app/controllers/roles_controller.rb
index a373c1b..a0ac666 100644
--- a/src/app/controllers/admin/roles_controller.rb
+++ b/src/app/controllers/roles_controller.rb
@@ -1,4 +1,4 @@
-class Admin::RolesController < ApplicationController
+class RolesController < ApplicationController
before_filter :require_user
before_filter :load_roles, :only => [:show]
before_filter :load_params_and_headers, :only => [:index]
diff --git a/src/app/controllers/admin/settings_controller.rb
b/src/app/controllers/settings_controller.rb
similarity index 95%
rename from src/app/controllers/admin/settings_controller.rb
rename to src/app/controllers/settings_controller.rb
index a6f5cec..4cd341c 100644
--- a/src/app/controllers/admin/settings_controller.rb
+++ b/src/app/controllers/settings_controller.rb
@@ -1,4 +1,4 @@
-class Admin::SettingsController < ApplicationController
+class SettingsController < ApplicationController
before_filter :require_user
# Settings MetaData Keys
diff --git a/src/app/controllers/image_factory/templates_controller.rb
b/src/app/controllers/templates_controller.rb
similarity index 99%
rename from src/app/controllers/image_factory/templates_controller.rb
rename to src/app/controllers/templates_controller.rb
index dc7ba71..786f55a 100644
--- a/src/app/controllers/image_factory/templates_controller.rb
+++ b/src/app/controllers/templates_controller.rb
@@ -1,6 +1,6 @@
require 'util/repository_manager'
-class ImageFactory::TemplatesController < ApplicationController
+class TemplatesController < ApplicationController
before_filter :require_user
before_filter :set_view_vars, :only => [:index, :show]
diff --git a/src/app/controllers/admin/users_controller.rb
b/src/app/controllers/users_controller.rb
similarity index 98%
rename from src/app/controllers/admin/users_controller.rb
rename to src/app/controllers/users_controller.rb
index d0297ad..8e3484c 100644
--- a/src/app/controllers/admin/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-class Admin::UsersController < ApplicationController
+class UsersController < ApplicationController
before_filter :require_user, :except => [:new, :create]
before_filter :load_users, :only => [:show]
diff --git a/src/app/helpers/resources/instances_helper.rb
b/src/app/helpers/resources/instances_helper.rb
deleted file mode 100644
index 91474ad..0000000
--- a/src/app/helpers/resources/instances_helper.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2009 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA. A copy of the GNU General Public License is
-# also available at
http://www.gnu.org/copyleft/gpl.html.
-
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-module Resources::InstancesHelper
- def owner_name(inst)
- return '' unless inst.owner
- # if last_name is set, use full name,
- # else use login
- if inst.owner.last_name.blank?
- inst.owner.login
- else
- "#{inst.owner.first_name} #{inst.owner.last_name}"
- end
- end
-end
diff --git a/src/app/views/image_factory/assemblies/index.haml
b/src/app/views/assemblies/index.haml
similarity index 100%
rename from src/app/views/image_factory/assemblies/index.haml
rename to src/app/views/assemblies/index.haml
diff --git a/src/app/views/image_factory/builds/index.haml
b/src/app/views/builds/index.haml
similarity index 100%
rename from src/app/views/image_factory/builds/index.haml
rename to src/app/views/builds/index.haml
diff --git a/src/app/views/image_factory/deployables/_assemblies.haml
b/src/app/views/deployables/_assemblies.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_assemblies.haml
rename to src/app/views/deployables/_assemblies.haml
diff --git a/src/app/views/image_factory/deployables/_deployments.haml
b/src/app/views/deployables/_deployments.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_deployments.haml
rename to src/app/views/deployables/_deployments.haml
diff --git a/src/app/views/image_factory/deployables/_form.haml
b/src/app/views/deployables/_form.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_form.haml
rename to src/app/views/deployables/_form.haml
diff --git a/src/app/views/image_factory/deployables/_list.haml
b/src/app/views/deployables/_list.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_list.haml
rename to src/app/views/deployables/_list.haml
diff --git a/src/app/views/image_factory/deployables/_pick_assemblies.haml
b/src/app/views/deployables/_pick_assemblies.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_pick_assemblies.haml
rename to src/app/views/deployables/_pick_assemblies.haml
diff --git a/src/app/views/image_factory/deployables/_properties.haml
b/src/app/views/deployables/_properties.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/_properties.haml
rename to src/app/views/deployables/_properties.haml
diff --git a/src/app/views/image_factory/deployables/edit.haml
b/src/app/views/deployables/edit.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/edit.haml
rename to src/app/views/deployables/edit.haml
diff --git a/src/app/views/admin/hardware_profiles/index.haml
b/src/app/views/deployables/index.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/index.haml
rename to src/app/views/deployables/index.haml
diff --git a/src/app/views/image_factory/deployables/new.haml
b/src/app/views/deployables/new.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/new.haml
rename to src/app/views/deployables/new.haml
diff --git a/src/app/views/image_factory/deployables/pick_assemblies.haml
b/src/app/views/deployables/pick_assemblies.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/pick_assemblies.haml
rename to src/app/views/deployables/pick_assemblies.haml
diff --git a/src/app/views/admin/provider_accounts/show.haml
b/src/app/views/deployables/show.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/show.haml
rename to src/app/views/deployables/show.haml
diff --git a/src/app/views/resources/deployments/_history.haml
b/src/app/views/deployments/_history.haml
similarity index 100%
rename from src/app/views/resources/deployments/_history.haml
rename to src/app/views/deployments/_history.haml
diff --git a/src/app/views/resources/deployments/_instances.haml
b/src/app/views/deployments/_instances.haml
similarity index 100%
rename from src/app/views/resources/deployments/_instances.haml
rename to src/app/views/deployments/_instances.haml
diff --git a/src/app/views/resources/deployments/_list.haml
b/src/app/views/deployments/_list.haml
similarity index 100%
rename from src/app/views/resources/deployments/_list.haml
rename to src/app/views/deployments/_list.haml
diff --git a/src/app/views/resources/deployments/_permissions.haml
b/src/app/views/deployments/_permissions.haml
similarity index 100%
rename from src/app/views/resources/deployments/_permissions.haml
rename to src/app/views/deployments/_permissions.haml
diff --git a/src/app/views/resources/deployments/_properties.haml
b/src/app/views/deployments/_properties.haml
similarity index 100%
rename from src/app/views/resources/deployments/_properties.haml
rename to src/app/views/deployments/_properties.haml
diff --git a/src/app/views/resources/deployments/_provider_services.haml
b/src/app/views/deployments/_provider_services.haml
similarity index 100%
rename from src/app/views/resources/deployments/_provider_services.haml
rename to src/app/views/deployments/_provider_services.haml
diff --git a/src/app/views/resources/deployments/_required_services.haml
b/src/app/views/deployments/_required_services.haml
similarity index 100%
rename from src/app/views/resources/deployments/_required_services.haml
rename to src/app/views/deployments/_required_services.haml
diff --git a/src/app/views/resources/deployments/index.haml
b/src/app/views/deployments/index.haml
similarity index 100%
rename from src/app/views/resources/deployments/index.haml
rename to src/app/views/deployments/index.haml
diff --git a/src/app/views/resources/deployments/launch_new.haml
b/src/app/views/deployments/launch_new.haml
similarity index 100%
rename from src/app/views/resources/deployments/launch_new.haml
rename to src/app/views/deployments/launch_new.haml
diff --git a/src/app/views/resources/deployments/new.haml
b/src/app/views/deployments/new.haml
similarity index 100%
rename from src/app/views/resources/deployments/new.haml
rename to src/app/views/deployments/new.haml
diff --git a/src/app/views/admin/hardware_profiles/show.haml
b/src/app/views/deployments/show.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/show.haml
rename to src/app/views/deployments/show.haml
diff --git a/src/app/views/admin/hardware_profiles/_form.haml
b/src/app/views/hardware_profiles/_form.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/_form.haml
rename to src/app/views/hardware_profiles/_form.haml
diff --git a/src/app/views/admin/hardware_profiles/_history.haml
b/src/app/views/hardware_profiles/_history.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/_history.haml
rename to src/app/views/hardware_profiles/_history.haml
diff --git a/src/app/views/admin/hardware_profiles/_list.haml
b/src/app/views/hardware_profiles/_list.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/_list.haml
rename to src/app/views/hardware_profiles/_list.haml
diff --git
a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
b/src/app/views/hardware_profiles/_matching_provider_hardware_profiles.haml
similarity index 100%
rename from
src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
rename to src/app/views/hardware_profiles/_matching_provider_hardware_profiles.haml
diff --git a/src/app/views/admin/hardware_profiles/_properties.haml
b/src/app/views/hardware_profiles/_properties.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/_properties.haml
rename to src/app/views/hardware_profiles/_properties.haml
diff --git a/src/app/views/admin/hardware_profiles/create.haml
b/src/app/views/hardware_profiles/create.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/create.haml
rename to src/app/views/hardware_profiles/create.haml
diff --git a/src/app/views/admin/hardware_profiles/edit.haml
b/src/app/views/hardware_profiles/edit.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/edit.haml
rename to src/app/views/hardware_profiles/edit.haml
diff --git a/src/app/views/admin/pool_families/index.haml
b/src/app/views/hardware_profiles/index.haml
similarity index 100%
rename from src/app/views/admin/pool_families/index.haml
rename to src/app/views/hardware_profiles/index.haml
diff --git a/src/app/views/admin/hardware_profiles/new.haml
b/src/app/views/hardware_profiles/new.haml
similarity index 100%
rename from src/app/views/admin/hardware_profiles/new.haml
rename to src/app/views/hardware_profiles/new.haml
diff --git a/src/app/views/resources/deployments/show.haml
b/src/app/views/hardware_profiles/show.haml
similarity index 100%
rename from src/app/views/resources/deployments/show.haml
rename to src/app/views/hardware_profiles/show.haml
diff --git a/src/app/views/image_factory/image_imports/new.haml
b/src/app/views/image_imports/new.haml
similarity index 100%
rename from src/app/views/image_factory/image_imports/new.haml
rename to src/app/views/image_imports/new.haml
diff --git a/src/app/views/resources/instances/_can_perform_state_change.xml.haml
b/src/app/views/instances/_can_perform_state_change.xml.haml
similarity index 100%
rename from src/app/views/resources/instances/_can_perform_state_change.xml.haml
rename to src/app/views/instances/_can_perform_state_change.xml.haml
diff --git a/src/app/views/resources/instances/_history.haml
b/src/app/views/instances/_history.haml
similarity index 100%
rename from src/app/views/resources/instances/_history.haml
rename to src/app/views/instances/_history.haml
diff --git a/src/app/views/resources/instances/_list.haml
b/src/app/views/instances/_list.haml
similarity index 100%
rename from src/app/views/resources/instances/_list.haml
rename to src/app/views/instances/_list.haml
diff --git a/src/app/views/resources/instances/_permissions.haml
b/src/app/views/instances/_permissions.haml
similarity index 100%
rename from src/app/views/resources/instances/_permissions.haml
rename to src/app/views/instances/_permissions.haml
diff --git a/src/app/views/resources/instances/_properties.haml
b/src/app/views/instances/_properties.haml
similarity index 100%
rename from src/app/views/resources/instances/_properties.haml
rename to src/app/views/instances/_properties.haml
diff --git a/src/app/views/admin/provider_accounts/index.haml
b/src/app/views/instances/index.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/index.haml
rename to src/app/views/instances/index.haml
diff --git a/src/app/views/resources/instances/new.haml
b/src/app/views/instances/new.haml
similarity index 100%
rename from src/app/views/resources/instances/new.haml
rename to src/app/views/instances/new.haml
diff --git a/src/app/views/resources/instances/select_template.haml
b/src/app/views/instances/select_template.haml
similarity index 100%
rename from src/app/views/resources/instances/select_template.haml
rename to src/app/views/instances/select_template.haml
diff --git a/src/app/views/image_factory/deployables/show.haml
b/src/app/views/instances/show.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/show.haml
rename to src/app/views/instances/show.haml
diff --git a/src/app/views/admin/pool_families/_form.haml
b/src/app/views/pool_families/_form.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_form.haml
rename to src/app/views/pool_families/_form.haml
diff --git a/src/app/views/admin/pool_families/_history.haml
b/src/app/views/pool_families/_history.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_history.haml
rename to src/app/views/pool_families/_history.haml
diff --git a/src/app/views/admin/pool_families/_list.haml
b/src/app/views/pool_families/_list.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_list.haml
rename to src/app/views/pool_families/_list.haml
diff --git a/src/app/views/admin/pool_families/_permissions.haml
b/src/app/views/pool_families/_permissions.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_permissions.haml
rename to src/app/views/pool_families/_permissions.haml
diff --git a/src/app/views/admin/pool_families/_pools.haml
b/src/app/views/pool_families/_pools.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_pools.haml
rename to src/app/views/pool_families/_pools.haml
diff --git a/src/app/views/admin/pool_families/_properties.haml
b/src/app/views/pool_families/_properties.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_properties.haml
rename to src/app/views/pool_families/_properties.haml
diff --git a/src/app/views/admin/pool_families/_provider_accounts.haml
b/src/app/views/pool_families/_provider_accounts.haml
similarity index 100%
rename from src/app/views/admin/pool_families/_provider_accounts.haml
rename to src/app/views/pool_families/_provider_accounts.haml
diff --git a/src/app/views/admin/pool_families/edit.haml
b/src/app/views/pool_families/edit.haml
similarity index 100%
rename from src/app/views/admin/pool_families/edit.haml
rename to src/app/views/pool_families/edit.haml
diff --git a/src/app/views/admin/providers/index.haml
b/src/app/views/pool_families/index.haml
similarity index 100%
rename from src/app/views/admin/providers/index.haml
rename to src/app/views/pool_families/index.haml
diff --git a/src/app/views/admin/pool_families/new.haml
b/src/app/views/pool_families/new.haml
similarity index 100%
rename from src/app/views/admin/pool_families/new.haml
rename to src/app/views/pool_families/new.haml
diff --git a/src/app/views/admin/pool_families/show.haml
b/src/app/views/pool_families/show.haml
similarity index 100%
rename from src/app/views/admin/pool_families/show.haml
rename to src/app/views/pool_families/show.haml
diff --git a/src/app/views/resources/pools/_deployments.haml
b/src/app/views/pools/_deployments.haml
similarity index 100%
rename from src/app/views/resources/pools/_deployments.haml
rename to src/app/views/pools/_deployments.haml
diff --git a/src/app/views/resources/pools/_history.haml
b/src/app/views/pools/_history.haml
similarity index 100%
rename from src/app/views/resources/pools/_history.haml
rename to src/app/views/pools/_history.haml
diff --git a/src/app/views/resources/pools/_instances.haml
b/src/app/views/pools/_instances.haml
similarity index 100%
rename from src/app/views/resources/pools/_instances.haml
rename to src/app/views/pools/_instances.haml
diff --git a/src/app/views/resources/pools/_list.haml b/src/app/views/pools/_list.haml
similarity index 100%
rename from src/app/views/resources/pools/_list.haml
rename to src/app/views/pools/_list.haml
diff --git a/src/app/views/resources/pools/_permissions.haml
b/src/app/views/pools/_permissions.haml
similarity index 100%
rename from src/app/views/resources/pools/_permissions.haml
rename to src/app/views/pools/_permissions.haml
diff --git a/src/app/views/resources/pools/_properties.haml
b/src/app/views/pools/_properties.haml
similarity index 100%
rename from src/app/views/resources/pools/_properties.haml
rename to src/app/views/pools/_properties.haml
diff --git a/src/app/views/resources/pools/edit.haml b/src/app/views/pools/edit.haml
similarity index 100%
rename from src/app/views/resources/pools/edit.haml
rename to src/app/views/pools/edit.haml
diff --git a/src/app/views/admin/realms/index.haml b/src/app/views/pools/index.haml
similarity index 100%
rename from src/app/views/admin/realms/index.haml
rename to src/app/views/pools/index.haml
diff --git a/src/app/views/resources/pools/new.haml b/src/app/views/pools/new.haml
similarity index 100%
rename from src/app/views/resources/pools/new.haml
rename to src/app/views/pools/new.haml
diff --git a/src/app/views/image_factory/templates/show.haml
b/src/app/views/pools/show.haml
similarity index 100%
rename from src/app/views/image_factory/templates/show.haml
rename to src/app/views/pools/show.haml
diff --git a/src/app/views/admin/provider_accounts/_credentials.haml
b/src/app/views/provider_accounts/_credentials.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_credentials.haml
rename to src/app/views/provider_accounts/_credentials.haml
diff --git a/src/app/views/admin/provider_accounts/_history.haml
b/src/app/views/provider_accounts/_history.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_history.haml
rename to src/app/views/provider_accounts/_history.haml
diff --git a/src/app/views/admin/provider_accounts/_list.haml
b/src/app/views/provider_accounts/_list.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_list.haml
rename to src/app/views/provider_accounts/_list.haml
diff --git a/src/app/views/admin/provider_accounts/_permissions.haml
b/src/app/views/provider_accounts/_permissions.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_permissions.haml
rename to src/app/views/provider_accounts/_permissions.haml
diff --git a/src/app/views/admin/provider_accounts/_properties.haml
b/src/app/views/provider_accounts/_properties.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_properties.haml
rename to src/app/views/provider_accounts/_properties.haml
diff --git a/src/app/views/admin/provider_accounts/_provider_form.haml
b/src/app/views/provider_accounts/_provider_form.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_provider_form.haml
rename to src/app/views/provider_accounts/_provider_form.haml
diff --git a/src/app/views/admin/provider_accounts/_provider_selection.haml
b/src/app/views/provider_accounts/_provider_selection.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_provider_selection.haml
rename to src/app/views/provider_accounts/_provider_selection.haml
diff --git a/src/app/views/admin/provider_accounts/_rhevm.haml
b/src/app/views/provider_accounts/_rhevm.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/_rhevm.haml
rename to src/app/views/provider_accounts/_rhevm.haml
diff --git a/src/app/views/admin/provider_accounts/edit.haml
b/src/app/views/provider_accounts/edit.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/edit.haml
rename to src/app/views/provider_accounts/edit.haml
diff --git a/src/app/views/admin/roles/index.haml
b/src/app/views/provider_accounts/index.haml
similarity index 100%
rename from src/app/views/admin/roles/index.haml
rename to src/app/views/provider_accounts/index.haml
diff --git a/src/app/views/admin/provider_accounts/new.haml
b/src/app/views/provider_accounts/new.haml
similarity index 100%
rename from src/app/views/admin/provider_accounts/new.haml
rename to src/app/views/provider_accounts/new.haml
diff --git a/src/app/views/resources/instances/show.haml
b/src/app/views/provider_accounts/show.haml
similarity index 100%
rename from src/app/views/resources/instances/show.haml
rename to src/app/views/provider_accounts/show.haml
diff --git a/src/app/views/admin/providers/_form.haml
b/src/app/views/providers/_form.haml
similarity index 100%
rename from src/app/views/admin/providers/_form.haml
rename to src/app/views/providers/_form.haml
diff --git a/src/app/views/admin/providers/_history.haml
b/src/app/views/providers/_history.haml
similarity index 100%
rename from src/app/views/admin/providers/_history.haml
rename to src/app/views/providers/_history.haml
diff --git a/src/app/views/admin/providers/_hw_profiles.haml
b/src/app/views/providers/_hw_profiles.haml
similarity index 100%
rename from src/app/views/admin/providers/_hw_profiles.haml
rename to src/app/views/providers/_hw_profiles.haml
diff --git a/src/app/views/admin/providers/_list.haml
b/src/app/views/providers/_list.haml
similarity index 100%
rename from src/app/views/admin/providers/_list.haml
rename to src/app/views/providers/_list.haml
diff --git a/src/app/views/admin/providers/_permissions.haml
b/src/app/views/providers/_permissions.haml
similarity index 100%
rename from src/app/views/admin/providers/_permissions.haml
rename to src/app/views/providers/_permissions.haml
diff --git a/src/app/views/admin/providers/_properties.haml
b/src/app/views/providers/_properties.haml
similarity index 100%
rename from src/app/views/admin/providers/_properties.haml
rename to src/app/views/providers/_properties.haml
diff --git a/src/app/views/admin/providers/_provider_accounts.haml
b/src/app/views/providers/_provider_accounts.haml
similarity index 100%
rename from src/app/views/admin/providers/_provider_accounts.haml
rename to src/app/views/providers/_provider_accounts.haml
diff --git a/src/app/views/admin/providers/_realms.haml
b/src/app/views/providers/_realms.haml
similarity index 100%
rename from src/app/views/admin/providers/_realms.haml
rename to src/app/views/providers/_realms.haml
diff --git a/src/app/views/admin/providers/_services.haml
b/src/app/views/providers/_services.haml
similarity index 100%
rename from src/app/views/admin/providers/_services.haml
rename to src/app/views/providers/_services.haml
diff --git a/src/app/views/admin/providers/edit.haml b/src/app/views/providers/edit.haml
similarity index 100%
rename from src/app/views/admin/providers/edit.haml
rename to src/app/views/providers/edit.haml
diff --git a/src/app/views/admin/users/index.haml b/src/app/views/providers/index.haml
similarity index 100%
rename from src/app/views/admin/users/index.haml
rename to src/app/views/providers/index.haml
diff --git a/src/app/views/admin/providers/new.haml b/src/app/views/providers/new.haml
similarity index 100%
rename from src/app/views/admin/providers/new.haml
rename to src/app/views/providers/new.haml
diff --git a/src/app/views/admin/providers/show.haml b/src/app/views/providers/show.haml
similarity index 100%
rename from src/app/views/admin/providers/show.haml
rename to src/app/views/providers/show.haml
diff --git a/src/app/views/admin/realm_mappings/new.haml
b/src/app/views/realm_mappings/new.haml
similarity index 100%
rename from src/app/views/admin/realm_mappings/new.haml
rename to src/app/views/realm_mappings/new.haml
diff --git a/src/app/views/admin/realm_mappings/show.haml
b/src/app/views/realm_mappings/show.haml
similarity index 100%
rename from src/app/views/admin/realm_mappings/show.haml
rename to src/app/views/realm_mappings/show.haml
diff --git a/src/app/views/admin/realms/_form.haml b/src/app/views/realms/_form.haml
similarity index 100%
rename from src/app/views/admin/realms/_form.haml
rename to src/app/views/realms/_form.haml
diff --git a/src/app/views/admin/realms/_list.haml b/src/app/views/realms/_list.haml
similarity index 100%
rename from src/app/views/admin/realms/_list.haml
rename to src/app/views/realms/_list.haml
diff --git a/src/app/views/admin/realms/_mapping.haml
b/src/app/views/realms/_mapping.haml
similarity index 100%
rename from src/app/views/admin/realms/_mapping.haml
rename to src/app/views/realms/_mapping.haml
diff --git a/src/app/views/admin/realms/_properties.haml
b/src/app/views/realms/_properties.haml
similarity index 100%
rename from src/app/views/admin/realms/_properties.haml
rename to src/app/views/realms/_properties.haml
diff --git a/src/app/views/admin/realms/edit.haml b/src/app/views/realms/edit.haml
similarity index 100%
rename from src/app/views/admin/realms/edit.haml
rename to src/app/views/realms/edit.haml
diff --git a/src/app/views/image_factory/deployables/index.haml
b/src/app/views/realms/index.haml
similarity index 100%
rename from src/app/views/image_factory/deployables/index.haml
rename to src/app/views/realms/index.haml
diff --git a/src/app/views/admin/realms/new.haml b/src/app/views/realms/new.haml
similarity index 100%
rename from src/app/views/admin/realms/new.haml
rename to src/app/views/realms/new.haml
diff --git a/src/app/views/admin/realms/show.haml b/src/app/views/realms/show.haml
similarity index 100%
rename from src/app/views/admin/realms/show.haml
rename to src/app/views/realms/show.haml
diff --git a/src/app/views/admin/roles/_form.haml b/src/app/views/roles/_form.haml
similarity index 100%
rename from src/app/views/admin/roles/_form.haml
rename to src/app/views/roles/_form.haml
diff --git a/src/app/views/admin/roles/_list.haml b/src/app/views/roles/_list.haml
similarity index 100%
rename from src/app/views/admin/roles/_list.haml
rename to src/app/views/roles/_list.haml
diff --git a/src/app/views/admin/roles/_properties.haml
b/src/app/views/roles/_properties.haml
similarity index 100%
rename from src/app/views/admin/roles/_properties.haml
rename to src/app/views/roles/_properties.haml
diff --git a/src/app/views/admin/roles/edit.haml b/src/app/views/roles/edit.haml
similarity index 100%
rename from src/app/views/admin/roles/edit.haml
rename to src/app/views/roles/edit.haml
diff --git a/src/app/views/image_factory/templates/index.haml
b/src/app/views/roles/index.haml
similarity index 100%
rename from src/app/views/image_factory/templates/index.haml
rename to src/app/views/roles/index.haml
diff --git a/src/app/views/admin/roles/new.haml b/src/app/views/roles/new.haml
similarity index 100%
rename from src/app/views/admin/roles/new.haml
rename to src/app/views/roles/new.haml
diff --git a/src/app/views/admin/settings/general_settings.haml
b/src/app/views/settings/general_settings.haml
similarity index 100%
rename from src/app/views/admin/settings/general_settings.haml
rename to src/app/views/settings/general_settings.haml
diff --git a/src/app/views/admin/settings/index.haml b/src/app/views/settings/index.haml
similarity index 100%
rename from src/app/views/admin/settings/index.haml
rename to src/app/views/settings/index.haml
diff --git a/src/app/views/admin/settings/self_service.haml
b/src/app/views/settings/self_service.haml
similarity index 100%
rename from src/app/views/admin/settings/self_service.haml
rename to src/app/views/settings/self_service.haml
diff --git a/src/app/views/image_factory/templates/_addbuttons.haml
b/src/app/views/templates/_addbuttons.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_addbuttons.haml
rename to src/app/views/templates/_addbuttons.haml
diff --git a/src/app/views/image_factory/templates/_basics.haml
b/src/app/views/templates/_basics.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_basics.haml
rename to src/app/views/templates/_basics.haml
diff --git a/src/app/views/image_factory/templates/_builds.haml
b/src/app/views/templates/_builds.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_builds.haml
rename to src/app/views/templates/_builds.haml
diff --git a/src/app/views/image_factory/templates/_collections.haml
b/src/app/views/templates/_collections.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_collections.haml
rename to src/app/views/templates/_collections.haml
diff --git a/src/app/views/image_factory/templates/_form.haml
b/src/app/views/templates/_form.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_form.haml
rename to src/app/views/templates/_form.haml
diff --git a/src/app/views/image_factory/templates/_hidden_fields.haml
b/src/app/views/templates/_hidden_fields.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_hidden_fields.haml
rename to src/app/views/templates/_hidden_fields.haml
diff --git a/src/app/views/image_factory/templates/_list.haml
b/src/app/views/templates/_list.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_list.haml
rename to src/app/views/templates/_list.haml
diff --git a/src/app/views/image_factory/templates/_local_content_to_bundle.haml
b/src/app/views/templates/_local_content_to_bundle.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_local_content_to_bundle.haml
rename to src/app/views/templates/_local_content_to_bundle.haml
diff --git a/src/app/views/image_factory/templates/_managed_content.haml
b/src/app/views/templates/_managed_content.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_managed_content.haml
rename to src/app/views/templates/_managed_content.haml
diff --git a/src/app/views/image_factory/templates/_metagroup_packages.haml
b/src/app/views/templates/_metagroup_packages.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_metagroup_packages.haml
rename to src/app/views/templates/_metagroup_packages.haml
diff --git a/src/app/views/image_factory/templates/_metagroups.haml
b/src/app/views/templates/_metagroups.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_metagroups.haml
rename to src/app/views/templates/_metagroups.haml
diff --git a/src/app/views/image_factory/templates/_preboot_configuration.haml
b/src/app/views/templates/_preboot_configuration.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_preboot_configuration.haml
rename to src/app/views/templates/_preboot_configuration.haml
diff --git a/src/app/views/image_factory/templates/_properties.haml
b/src/app/views/templates/_properties.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_properties.haml
rename to src/app/views/templates/_properties.haml
diff --git a/src/app/views/image_factory/templates/_search_packages.haml
b/src/app/views/templates/_search_packages.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_search_packages.haml
rename to src/app/views/templates/_search_packages.haml
diff --git a/src/app/views/image_factory/templates/_software_selection.haml
b/src/app/views/templates/_software_selection.haml
similarity index 100%
rename from src/app/views/image_factory/templates/_software_selection.haml
rename to src/app/views/templates/_software_selection.haml
diff --git a/src/app/views/image_factory/templates/collections.haml
b/src/app/views/templates/collections.haml
similarity index 100%
rename from src/app/views/image_factory/templates/collections.haml
rename to src/app/views/templates/collections.haml
diff --git a/src/app/views/image_factory/templates/edit.haml
b/src/app/views/templates/edit.haml
similarity index 100%
rename from src/app/views/image_factory/templates/edit.haml
rename to src/app/views/templates/edit.haml
diff --git a/src/app/views/resources/instances/index.haml
b/src/app/views/templates/index.haml
similarity index 100%
rename from src/app/views/resources/instances/index.haml
rename to src/app/views/templates/index.haml
diff --git a/src/app/views/image_factory/templates/managed_content.haml
b/src/app/views/templates/managed_content.haml
similarity index 100%
rename from src/app/views/image_factory/templates/managed_content.haml
rename to src/app/views/templates/managed_content.haml
diff --git a/src/app/views/image_factory/templates/metagroup_packages.haml
b/src/app/views/templates/metagroup_packages.haml
similarity index 100%
rename from src/app/views/image_factory/templates/metagroup_packages.haml
rename to src/app/views/templates/metagroup_packages.haml
diff --git a/src/app/views/image_factory/templates/new.haml
b/src/app/views/templates/new.haml
similarity index 100%
rename from src/app/views/image_factory/templates/new.haml
rename to src/app/views/templates/new.haml
diff --git a/src/app/views/image_factory/templates/search_packages.haml
b/src/app/views/templates/search_packages.haml
similarity index 100%
rename from src/app/views/image_factory/templates/search_packages.haml
rename to src/app/views/templates/search_packages.haml
diff --git a/src/app/views/resources/pools/show.haml b/src/app/views/templates/show.haml
similarity index 100%
rename from src/app/views/resources/pools/show.haml
rename to src/app/views/templates/show.haml
diff --git a/src/app/views/admin/users/_form.haml b/src/app/views/users/_form.haml
similarity index 100%
rename from src/app/views/admin/users/_form.haml
rename to src/app/views/users/_form.haml
diff --git a/src/app/views/admin/users/_list.haml b/src/app/views/users/_list.haml
similarity index 100%
rename from src/app/views/admin/users/_list.haml
rename to src/app/views/users/_list.haml
diff --git a/src/app/views/admin/users/_properties.haml
b/src/app/views/users/_properties.haml
similarity index 100%
rename from src/app/views/admin/users/_properties.haml
rename to src/app/views/users/_properties.haml
diff --git a/src/app/views/admin/users/edit.haml b/src/app/views/users/edit.haml
similarity index 100%
rename from src/app/views/admin/users/edit.haml
rename to src/app/views/users/edit.haml
diff --git a/src/app/views/resources/pools/index.haml b/src/app/views/users/index.haml
similarity index 100%
rename from src/app/views/resources/pools/index.haml
rename to src/app/views/users/index.haml
diff --git a/src/app/views/admin/users/new.haml b/src/app/views/users/new.haml
similarity index 100%
rename from src/app/views/admin/users/new.haml
rename to src/app/views/users/new.haml
--
1.7.4.4