diff --git a/campaign/campaign/migrations/0001_initial.py b/campaign/campaign/migrations/0001_initial.py
deleted file mode 100644
index 6ee2273a219fe2c2aeaff3211a309199aaff423e..0000000000000000000000000000000000000000
--- a/campaign/campaign/migrations/0001_initial.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Argumentary',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('lang', models.CharField(max_length=255)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Campaign',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('title', models.CharField(max_length=255)),
-                ('description', models.CharField(max_length=512)),
-                ('start_date', models.DateTimeField()),
-                ('end_date', models.DateTimeField()),
-                ('default_lang', models.CharField(max_length=5)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='CampaignContact',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('weight', models.IntegerField(default=0)),
-                ('campaign_id', models.ForeignKey(to='campaign.Campaign')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Contact',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('first_name', models.CharField(max_length=64)),
-                ('last_name', models.CharField(max_length=64)),
-                ('phone', models.CharField(max_length=32)),
-                ('twitter', models.CharField(max_length=64)),
-                ('mail', models.CharField(max_length=255)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('name', models.CharField(max_length=64)),
-                ('type', models.CharField(max_length=255)),
-                ('media', models.CharField(max_length=255)),
-                ('contacts', models.ManyToManyField(to='campaign.Contact')),
-                ('organisation_id', models.ForeignKey(to='organization.Organization')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.AddField(
-            model_name='campaigncontact',
-            name='contact_id',
-            field=models.ForeignKey(to='campaign.Contact'),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='argumentary',
-            name='campaign_id',
-            field=models.ForeignKey(to='campaign.Campaign'),
-            preserve_default=True,
-        ),
-    ]
diff --git a/campaign/campaign/models.py b/campaign/campaign/models.py
index 05683704e55a3a8e01f18be308ee742b93cd704f..7f3b589ded1881aa63697eddbf7c731dd78e1fb4 100644
--- a/campaign/campaign/models.py
+++ b/campaign/campaign/models.py
@@ -29,7 +29,7 @@ class Campaign(models.Model):
 
 class Argumentary(models.Model):
     id = models.AutoField(primary_key=True)
-    campaign_id = models.ForeignKey(Campaign)
+    campaign = models.ForeignKey(Campaign)
     lang = models.CharField(max_length=255)
     text = models.TextField(null=True)
 
@@ -37,6 +37,6 @@ class Argumentary(models.Model):
 class CampaignContact(models.Model):
     """List contact related to a campaign with a given weight"""
     id = models.AutoField(primary_key=True)
-    campaign_id = models.ForeignKey(Campaign)
-    contact_id = models.ForeignKey(Contact)
+    campaign = models.ForeignKey(Campaign)
+    contact = models.ForeignKey(Contact)
     weight = models.IntegerField(default=0)
diff --git a/campaign/organization/admin.py b/campaign/organization/admin.py
index fada3a50a3f09ffa889414595000941109f53639..108198fc78730ebecc74c3a992b88943ed82fa28 100644
--- a/campaign/organization/admin.py
+++ b/campaign/organization/admin.py
@@ -1,5 +1,6 @@
 from django.contrib import admin
-from campaign.organization.models import Organization, Group
+from campaign.organization.models import Organization, Group, FeedbackCategory
 
 admin.site.register(Organization)
 admin.site.register(Group)
+admin.site.register(FeedbackCategory)
diff --git a/campaign/organization/migrations/0001_initial.py b/campaign/organization/migrations/0001_initial.py
deleted file mode 100644
index 5e7ae5199597b9a23a07a9f260093a5f9648df97..0000000000000000000000000000000000000000
--- a/campaign/organization/migrations/0001_initial.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Organization',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
-                ('name', models.CharField(max_length=64)),
-                ('sip_key', models.CharField(max_length=255)),
-                ('users', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-    ]
diff --git a/campaign/organization/models.py b/campaign/organization/models.py
index d10d0bcc310124077604def602fd7de5ac79bbd7..4598caad265991d6f3a5dcfebc8049efa30fac21 100644
--- a/campaign/organization/models.py
+++ b/campaign/organization/models.py
@@ -7,7 +7,7 @@ class Organization(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=64)
     sip_key = models.CharField(max_length=255)
-    users = models.ForeignKey(User, null=True, blank=True)
+    users = models.ManyToManyField(User, null=True, blank=True)
 
     def __unicode__(self):
         return self.name
@@ -16,7 +16,7 @@ class Organization(models.Model):
 class Group(models.Model):
     """Group model to qualify contacts"""
     id = models.AutoField(primary_key=True)
-    organisation_id = models.ForeignKey(Organization)
+    organisation = models.ForeignKey(Organization)
     name = models.CharField(max_length=64)
     type = models.CharField(max_length=255, blank=True)
     media = models.CharField(max_length=255, blank=True)
@@ -24,3 +24,11 @@ class Group(models.Model):
 
     def __unicode__(self):
         return self.name
+
+
+class FeedbackCategory(models.Model):
+    id = models.AutoField(primary_key=True)
+    name = models.CharField(max_length=64)
+
+    def __unicode__(self):
+        return self.name
diff --git a/campaign/settings.py b/campaign/settings.py
index 77ce7202b1b7f09816fb7f47911ebaf75edccfab..51bcb3a32f897464c1fb2c283c4c0281e9679bcb 100644
--- a/campaign/settings.py
+++ b/campaign/settings.py
@@ -38,6 +38,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'campaign.campaign',
     'campaign.organization',
+    'campaign.feedback',
 )
 
 MIDDLEWARE_CLASSES = (