diff --git a/controllers/custom_wizard/admin/admin.rb b/app/controllers/custom_wizard/admin/admin.rb
similarity index 100%
rename from controllers/custom_wizard/admin/admin.rb
rename to app/controllers/custom_wizard/admin/admin.rb
diff --git a/controllers/custom_wizard/admin/api.rb b/app/controllers/custom_wizard/admin/api.rb
similarity index 100%
rename from controllers/custom_wizard/admin/api.rb
rename to app/controllers/custom_wizard/admin/api.rb
diff --git a/controllers/custom_wizard/admin/custom_fields.rb b/app/controllers/custom_wizard/admin/custom_fields.rb
similarity index 100%
rename from controllers/custom_wizard/admin/custom_fields.rb
rename to app/controllers/custom_wizard/admin/custom_fields.rb
diff --git a/controllers/custom_wizard/admin/logs.rb b/app/controllers/custom_wizard/admin/logs.rb
similarity index 100%
rename from controllers/custom_wizard/admin/logs.rb
rename to app/controllers/custom_wizard/admin/logs.rb
diff --git a/controllers/custom_wizard/admin/manager.rb b/app/controllers/custom_wizard/admin/manager.rb
similarity index 100%
rename from controllers/custom_wizard/admin/manager.rb
rename to app/controllers/custom_wizard/admin/manager.rb
diff --git a/controllers/custom_wizard/admin/notice.rb b/app/controllers/custom_wizard/admin/notice.rb
similarity index 100%
rename from controllers/custom_wizard/admin/notice.rb
rename to app/controllers/custom_wizard/admin/notice.rb
diff --git a/controllers/custom_wizard/admin/submissions.rb b/app/controllers/custom_wizard/admin/submissions.rb
similarity index 100%
rename from controllers/custom_wizard/admin/submissions.rb
rename to app/controllers/custom_wizard/admin/submissions.rb
diff --git a/controllers/custom_wizard/admin/subscription.rb b/app/controllers/custom_wizard/admin/subscription.rb
similarity index 100%
rename from controllers/custom_wizard/admin/subscription.rb
rename to app/controllers/custom_wizard/admin/subscription.rb
diff --git a/controllers/custom_wizard/admin/wizard.rb b/app/controllers/custom_wizard/admin/wizard.rb
similarity index 100%
rename from controllers/custom_wizard/admin/wizard.rb
rename to app/controllers/custom_wizard/admin/wizard.rb
diff --git a/controllers/custom_wizard/realtime_validations.rb b/app/controllers/custom_wizard/realtime_validations.rb
similarity index 100%
rename from controllers/custom_wizard/realtime_validations.rb
rename to app/controllers/custom_wizard/realtime_validations.rb
diff --git a/controllers/custom_wizard/steps.rb b/app/controllers/custom_wizard/steps.rb
similarity index 100%
rename from controllers/custom_wizard/steps.rb
rename to app/controllers/custom_wizard/steps.rb
diff --git a/controllers/custom_wizard/wizard.rb b/app/controllers/custom_wizard/wizard.rb
similarity index 100%
rename from controllers/custom_wizard/wizard.rb
rename to app/controllers/custom_wizard/wizard.rb
diff --git a/jobs/regular/refresh_api_access_token.rb b/app/jobs/regular/refresh_api_access_token.rb
similarity index 100%
rename from jobs/regular/refresh_api_access_token.rb
rename to app/jobs/regular/refresh_api_access_token.rb
diff --git a/jobs/regular/set_after_time_wizard.rb b/app/jobs/regular/set_after_time_wizard.rb
similarity index 100%
rename from jobs/regular/set_after_time_wizard.rb
rename to app/jobs/regular/set_after_time_wizard.rb
diff --git a/jobs/scheduled/custom_wizard/update_notices.rb b/app/jobs/scheduled/custom_wizard/update_notices.rb
similarity index 100%
rename from jobs/scheduled/custom_wizard/update_notices.rb
rename to app/jobs/scheduled/custom_wizard/update_notices.rb
diff --git a/jobs/scheduled/custom_wizard/update_subscription.rb b/app/jobs/scheduled/custom_wizard/update_subscription.rb
similarity index 100%
rename from jobs/scheduled/custom_wizard/update_subscription.rb
rename to app/jobs/scheduled/custom_wizard/update_subscription.rb
diff --git a/serializers/custom_wizard/api/authorization_serializer.rb b/app/serializers/custom_wizard/api/authorization_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/api/authorization_serializer.rb
rename to app/serializers/custom_wizard/api/authorization_serializer.rb
diff --git a/serializers/custom_wizard/api/basic_endpoint_serializer.rb b/app/serializers/custom_wizard/api/basic_endpoint_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/api/basic_endpoint_serializer.rb
rename to app/serializers/custom_wizard/api/basic_endpoint_serializer.rb
diff --git a/serializers/custom_wizard/api/endpoint_serializer.rb b/app/serializers/custom_wizard/api/endpoint_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/api/endpoint_serializer.rb
rename to app/serializers/custom_wizard/api/endpoint_serializer.rb
diff --git a/serializers/custom_wizard/api/log_serializer.rb b/app/serializers/custom_wizard/api/log_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/api/log_serializer.rb
rename to app/serializers/custom_wizard/api/log_serializer.rb
diff --git a/serializers/custom_wizard/api_serializer.rb b/app/serializers/custom_wizard/api_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/api_serializer.rb
rename to app/serializers/custom_wizard/api_serializer.rb
diff --git a/serializers/custom_wizard/basic_api_serializer.rb b/app/serializers/custom_wizard/basic_api_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/basic_api_serializer.rb
rename to app/serializers/custom_wizard/basic_api_serializer.rb
diff --git a/serializers/custom_wizard/basic_wizard_serializer.rb b/app/serializers/custom_wizard/basic_wizard_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/basic_wizard_serializer.rb
rename to app/serializers/custom_wizard/basic_wizard_serializer.rb
diff --git a/serializers/custom_wizard/custom_field_serializer.rb b/app/serializers/custom_wizard/custom_field_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/custom_field_serializer.rb
rename to app/serializers/custom_wizard/custom_field_serializer.rb
diff --git a/serializers/custom_wizard/log_serializer.rb b/app/serializers/custom_wizard/log_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/log_serializer.rb
rename to app/serializers/custom_wizard/log_serializer.rb
diff --git a/serializers/custom_wizard/notice_serializer.rb b/app/serializers/custom_wizard/notice_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/notice_serializer.rb
rename to app/serializers/custom_wizard/notice_serializer.rb
diff --git a/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb b/app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
rename to app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
diff --git a/serializers/custom_wizard/submission_serializer.rb b/app/serializers/custom_wizard/submission_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/submission_serializer.rb
rename to app/serializers/custom_wizard/submission_serializer.rb
diff --git a/serializers/custom_wizard/subscription/authentication_serializer.rb b/app/serializers/custom_wizard/subscription/authentication_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/subscription/authentication_serializer.rb
rename to app/serializers/custom_wizard/subscription/authentication_serializer.rb
diff --git a/serializers/custom_wizard/subscription/subscription_serializer.rb b/app/serializers/custom_wizard/subscription/subscription_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/subscription/subscription_serializer.rb
rename to app/serializers/custom_wizard/subscription/subscription_serializer.rb
diff --git a/serializers/custom_wizard/subscription_serializer.rb b/app/serializers/custom_wizard/subscription_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/subscription_serializer.rb
rename to app/serializers/custom_wizard/subscription_serializer.rb
diff --git a/serializers/custom_wizard/wizard_field_serializer.rb b/app/serializers/custom_wizard/wizard_field_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/wizard_field_serializer.rb
rename to app/serializers/custom_wizard/wizard_field_serializer.rb
diff --git a/serializers/custom_wizard/wizard_serializer.rb b/app/serializers/custom_wizard/wizard_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/wizard_serializer.rb
rename to app/serializers/custom_wizard/wizard_serializer.rb
diff --git a/serializers/custom_wizard/wizard_step_serializer.rb b/app/serializers/custom_wizard/wizard_step_serializer.rb
similarity index 100%
rename from serializers/custom_wizard/wizard_step_serializer.rb
rename to app/serializers/custom_wizard/wizard_step_serializer.rb
diff --git a/views/layouts/wizard.html.erb b/app/views/layouts/wizard.html.erb
similarity index 100%
rename from views/layouts/wizard.html.erb
rename to app/views/layouts/wizard.html.erb
diff --git a/extensions/custom_field/extension.rb b/lib/custom_wizard/extensions/custom_field/extension.rb
similarity index 100%
rename from extensions/custom_field/extension.rb
rename to lib/custom_wizard/extensions/custom_field/extension.rb
diff --git a/extensions/custom_field/preloader.rb b/lib/custom_wizard/extensions/custom_field/preloader.rb
similarity index 100%
rename from extensions/custom_field/preloader.rb
rename to lib/custom_wizard/extensions/custom_field/preloader.rb
diff --git a/extensions/custom_field/serializer.rb b/lib/custom_wizard/extensions/custom_field/serializer.rb
similarity index 100%
rename from extensions/custom_field/serializer.rb
rename to lib/custom_wizard/extensions/custom_field/serializer.rb
diff --git a/extensions/extra_locales_controller.rb b/lib/custom_wizard/extensions/extra_locales_controller.rb
similarity index 100%
rename from extensions/extra_locales_controller.rb
rename to lib/custom_wizard/extensions/extra_locales_controller.rb
diff --git a/extensions/invites_controller.rb b/lib/custom_wizard/extensions/invites_controller.rb
similarity index 100%
rename from extensions/invites_controller.rb
rename to lib/custom_wizard/extensions/invites_controller.rb
diff --git a/extensions/users_controller.rb b/lib/custom_wizard/extensions/users_controller.rb
similarity index 100%
rename from extensions/users_controller.rb
rename to lib/custom_wizard/extensions/users_controller.rb
diff --git a/plugin.rb b/plugin.rb
index 8c6be4db..e41fcee8 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -63,22 +63,22 @@ after_initialize do
   %w[
     ../lib/custom_wizard/engine.rb
     ../config/routes.rb
-    ../controllers/custom_wizard/admin/admin.rb
-    ../controllers/custom_wizard/admin/wizard.rb
-    ../controllers/custom_wizard/admin/submissions.rb
-    ../controllers/custom_wizard/admin/api.rb
-    ../controllers/custom_wizard/admin/logs.rb
-    ../controllers/custom_wizard/admin/manager.rb
-    ../controllers/custom_wizard/admin/custom_fields.rb
-    ../controllers/custom_wizard/admin/subscription.rb
-    ../controllers/custom_wizard/admin/notice.rb
-    ../controllers/custom_wizard/wizard.rb
-    ../controllers/custom_wizard/steps.rb
-    ../controllers/custom_wizard/realtime_validations.rb
-    ../jobs/regular/refresh_api_access_token.rb
-    ../jobs/regular/set_after_time_wizard.rb
-    ../jobs/scheduled/custom_wizard/update_subscription.rb
-    ../jobs/scheduled/custom_wizard/update_notices.rb
+    ../app/controllers/custom_wizard/admin/admin.rb
+    ../app/controllers/custom_wizard/admin/wizard.rb
+    ../app/controllers/custom_wizard/admin/submissions.rb
+    ../app/controllers/custom_wizard/admin/api.rb
+    ../app/controllers/custom_wizard/admin/logs.rb
+    ../app/controllers/custom_wizard/admin/manager.rb
+    ../app/controllers/custom_wizard/admin/custom_fields.rb
+    ../app/controllers/custom_wizard/admin/subscription.rb
+    ../app/controllers/custom_wizard/admin/notice.rb
+    ../app/controllers/custom_wizard/wizard.rb
+    ../app/controllers/custom_wizard/steps.rb
+    ../app/controllers/custom_wizard/realtime_validations.rb
+    ../app/jobs/regular/refresh_api_access_token.rb
+    ../app/jobs/regular/set_after_time_wizard.rb
+    ../app/jobs/scheduled/custom_wizard/update_subscription.rb
+    ../app/jobs/scheduled/custom_wizard/update_notices.rb
     ../lib/custom_wizard/validators/template.rb
     ../lib/custom_wizard/validators/update.rb
     ../lib/custom_wizard/action_result.rb
@@ -108,30 +108,30 @@ after_initialize do
     ../lib/custom_wizard/api/log_entry.rb
     ../lib/custom_wizard/liquid_extensions/first_non_empty.rb
     ../lib/custom_wizard/exceptions/exceptions.rb
-    ../serializers/custom_wizard/api/authorization_serializer.rb
-    ../serializers/custom_wizard/api/basic_endpoint_serializer.rb
-    ../serializers/custom_wizard/api/endpoint_serializer.rb
-    ../serializers/custom_wizard/api/log_serializer.rb
-    ../serializers/custom_wizard/api_serializer.rb
-    ../serializers/custom_wizard/basic_api_serializer.rb
-    ../serializers/custom_wizard/basic_wizard_serializer.rb
-    ../serializers/custom_wizard/custom_field_serializer.rb
-    ../serializers/custom_wizard/wizard_field_serializer.rb
-    ../serializers/custom_wizard/wizard_step_serializer.rb
-    ../serializers/custom_wizard/wizard_serializer.rb
-    ../serializers/custom_wizard/log_serializer.rb
-    ../serializers/custom_wizard/submission_serializer.rb
-    ../serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
-    ../serializers/custom_wizard/subscription/authentication_serializer.rb
-    ../serializers/custom_wizard/subscription/subscription_serializer.rb
-    ../serializers/custom_wizard/subscription_serializer.rb
-    ../serializers/custom_wizard/notice_serializer.rb
-    ../extensions/extra_locales_controller.rb
-    ../extensions/invites_controller.rb
-    ../extensions/users_controller.rb
-    ../extensions/custom_field/preloader.rb
-    ../extensions/custom_field/serializer.rb
-    ../extensions/custom_field/extension.rb
+    ../app/serializers/custom_wizard/api/authorization_serializer.rb
+    ../app/serializers/custom_wizard/api/basic_endpoint_serializer.rb
+    ../app/serializers/custom_wizard/api/endpoint_serializer.rb
+    ../app/serializers/custom_wizard/api/log_serializer.rb
+    ../app/serializers/custom_wizard/api_serializer.rb
+    ../app/serializers/custom_wizard/basic_api_serializer.rb
+    ../app/serializers/custom_wizard/basic_wizard_serializer.rb
+    ../app/serializers/custom_wizard/custom_field_serializer.rb
+    ../app/serializers/custom_wizard/wizard_field_serializer.rb
+    ../app/serializers/custom_wizard/wizard_step_serializer.rb
+    ../app/serializers/custom_wizard/wizard_serializer.rb
+    ../app/serializers/custom_wizard/log_serializer.rb
+    ../app/serializers/custom_wizard/submission_serializer.rb
+    ../app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
+    ../app/serializers/custom_wizard/subscription/authentication_serializer.rb
+    ../app/serializers/custom_wizard/subscription/subscription_serializer.rb
+    ../app/serializers/custom_wizard/subscription_serializer.rb
+    ../app/serializers/custom_wizard/notice_serializer.rb
+    ..//lib/custom_wizard/extensions/extra_locales_controller.rb
+    ..//lib/custom_wizard/extensions/invites_controller.rb
+    ..//lib/custom_wizard/extensions/users_controller.rb
+    ..//lib/custom_wizard/extensions/custom_field/preloader.rb
+    ..//lib/custom_wizard/extensions/custom_field/serializer.rb
+    ..//lib/custom_wizard/extensions/custom_field/extension.rb
   ].each do |path|
     load File.expand_path(path, __FILE__)
   end