diff --git a/app/controllers/admin/poll/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb
similarity index 75%
rename from app/controllers/admin/poll/answers_controller.rb
rename to app/controllers/admin/poll/questions/answers_controller.rb
index 5650ab773..d0a7c4cc7 100644
--- a/app/controllers/admin/poll/answers_controller.rb
+++ b/app/controllers/admin/poll/questions/answers_controller.rb
@@ -1,14 +1,14 @@
-class Admin::Poll::AnswersController < Admin::Poll::BaseController
+class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
   before_action :load_question
 
   load_and_authorize_resource :question, class: "::Poll::Question"
 
   def new
-    @answer = Poll::QuestionAnswer.new
+    @answer = ::Poll::Question::Answer.new
   end
 
   def create
-    @answer = Poll::QuestionAnswer.new(answer_params)
+    @answer = ::Poll::Question::Answer.new(answer_params)
 
     if @answer.save
       redirect_to admin_question_path(@question),
diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb
index 5d370509b..af29143ae 100644
--- a/app/models/poll/question.rb
+++ b/app/models/poll/question.rb
@@ -15,7 +15,7 @@ class Poll::Question < ActiveRecord::Base
 
   has_many :comments, as: :commentable
   has_many :answers
-  has_many :question_answers, class_name: 'Poll::QuestionAnswer', foreign_key: 'poll_question_id'
+  has_many :question_answers, class_name: 'Poll::Question::Answer', foreign_key: 'poll_question_id'
   has_many :partial_results
   belongs_to :proposal
 
diff --git a/app/models/poll/question_answer.rb b/app/models/poll/question/answer.rb
similarity index 77%
rename from app/models/poll/question_answer.rb
rename to app/models/poll/question/answer.rb
index 871336cfd..641512263 100644
--- a/app/models/poll/question_answer.rb
+++ b/app/models/poll/question/answer.rb
@@ -1,4 +1,4 @@
-class Poll::QuestionAnswer < ActiveRecord::Base
+class Poll::Question::Answer < ActiveRecord::Base
   belongs_to :question, class_name: 'Poll::Question', foreign_key: 'poll_question_id'
 
   validates :title, presence: true
diff --git a/app/views/admin/poll/answers/_form.html.erb b/app/views/admin/poll/questions/answers/_form.html.erb
similarity index 100%
rename from app/views/admin/poll/answers/_form.html.erb
rename to app/views/admin/poll/questions/answers/_form.html.erb
diff --git a/app/views/admin/poll/answers/new.html.erb b/app/views/admin/poll/questions/answers/new.html.erb
similarity index 100%
rename from app/views/admin/poll/answers/new.html.erb
rename to app/views/admin/poll/questions/answers/new.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 4bead575d..89691feac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -301,7 +301,7 @@ Rails.application.routes.draw do
       end
 
       resources :questions do
-        resources :answers, only: [:new, :create]
+        resources :answers, only: [:new, :create], controller: 'questions/answers'
       end
     end