Reordered some elements in Api::Base and user.rb to be more clear on what we do