More modularizing for Rails 4