update to latest capybara infrastructure.
move organization settings to it's own controllers.