Remake Devise models as discussed in #1