diff --git a/Entity/Event.php b/Entity/Event.php
index acafc5ae3..a92bf8b26 100644
--- a/Entity/Event.php
+++ b/Entity/Event.php
@@ -1,67 +1,111 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\EventBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 
 /**
- * Event
+ * Class Event
+ *
+ * @package Chill\EventBundle\Entity
+ * @ORM\Entity(repositoryClass="Chill\EventBundle\Repository\EventRepository")
+ * @ORM\Table(name="chill_event_event")
+ * @ORM\HasLifecycleCallbacks()
  */
 class Event implements HasCenterInterface, HasScopeInterface
 {
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
+     * @ORM\Column(type="string", length=150)
      */
     private $name;
 
     /**
      * @var \DateTime
+     * @ORM\Column(type="datetime")
      */
     private $date;
     
     /**
      *
-     * @var \Chill\MainBundle\Entity\Center
+     * @var Center
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
      */
     private $center;
     
     /**
      *
      * @var EventType
+     * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\EventType")
      */
     private $type;
     
     /**
      *
-     * @var \Chill\MainBundle\Entity\Scope
+     * @var Scope
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
     private $circle;
     
     /**
-     * @var \Doctrine\Common\Collections\Collection
+     * @var Participation
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\EventBundle\Entity\Participation",
+     *     mappedBy="event")
      */
     private $participations;
     
     /**
-     * @var integer
+     *
+     * @var User
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
     private $moderator;
     
+    
     /**
-     * Constructor
+     * Event constructor.
      */
     public function __construct()
     {
-        $this->participations = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->participations = new ArrayCollection();
     }
 
-
     /**
      * Get id
      *
@@ -76,7 +120,6 @@ class Event implements HasCenterInterface, HasScopeInterface
      * Set label
      *
      * @param string $label
-     *
      * @return Event
      */
     public function setName($label)
@@ -100,7 +143,6 @@ class Event implements HasCenterInterface, HasScopeInterface
      * Set date
      *
      * @param \DateTime $date
-     *
      * @return Event
      */
     public function setDate(\DateTime $date)
@@ -120,7 +162,11 @@ class Event implements HasCenterInterface, HasScopeInterface
         return $this->date;
     }
     
-    public function setCenter(\Chill\MainBundle\Entity\Center $center)
+    /**
+     * @param Center $center
+     * @return $this
+     */
+    public function setCenter(Center $center)
     {
         $this->center = $center;
         
@@ -128,7 +174,6 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
     
     /**
-     *
      * @return EventType
      */
     public function getType()
@@ -137,9 +182,8 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     *
-     * @param \Chill\EventBundle\Entity\EventType $type
-     * @return \Chill\EventBundle\Entity\Event
+     * @param EventType $type
+     * @return $this
      */
     public function setType(EventType $type)
     {
@@ -148,8 +192,7 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     *
-     * @return \Chill\MainBundle\Entity\Center
+     * @return Center
      */
     public function getCenter()
     {
@@ -157,8 +200,7 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
     
     /**
-     *
-     * @return \Chill\MainBundle\Entity\Scope
+     * @return Scope
      */
     public function getCircle()
     {
@@ -166,9 +208,8 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     *
-     * @param \Chill\MainBundle\Entity\Scope $circle
-     * @return \Chill\EventBundle\Entity\Event
+     * @param Scope $circle
+     * @return $this
      */
     public function setCircle(\Chill\MainBundle\Entity\Scope $circle)
     {
@@ -177,9 +218,8 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
     
     /**
-     *
      * @deprecated
-     * @return \Chill\MainBundle\Entity\Scope
+     * @return Scope
      */
     public function getScope()
     {
@@ -190,11 +230,10 @@ class Event implements HasCenterInterface, HasScopeInterface
     /**
      * Add participation
      *
-     * @param \Chill\EventBundle\Entity\Participation $participation
-     *
+     * @param Participation $participation
      * @return Event
      */
-    public function addParticipation(\Chill\EventBundle\Entity\Participation $participation)
+    public function addParticipation(Participation $participation)
     {
         $this->participations[] = $participation;
 
@@ -204,17 +243,15 @@ class Event implements HasCenterInterface, HasScopeInterface
     /**
      * Remove participation
      *
-     * @param \Chill\EventBundle\Entity\Participation $participation
+     * @param Participation $participation
      */
-    public function removeParticipation(\Chill\EventBundle\Entity\Participation $participation)
+    public function removeParticipation(Participation $participation)
     {
         $this->participations->removeElement($participation);
     }
-
+    
     /**
-     * Get participations
-     *
-     * @return \ArrayIterator|\Doctrine\Common\Collections\Collection|\Traversable
+     * @return \ArrayIterator|\Traversable|Collection
      */
     public function getParticipations()
     {
diff --git a/Entity/EventType.php b/Entity/EventType.php
index 8f0d2bba4..8c67d8c81 100644
--- a/Entity/EventType.php
+++ b/Entity/EventType.php
@@ -1,34 +1,74 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\EventBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
+
 /**
- * EventType
+ * Class EventType
+ *
+ * @package Chill\EventBundle\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_event_event_type")
+ * @ORM\HasLifecycleCallbacks()
  */
 class EventType
 {
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var array
+     * @ORM\Column(type="json_array")
      */
     private $name;
 
     /**
      * @var boolean
+     * @ORM\Column(type="boolean")
      */
     private $active;
     
     /**
-     * @var \Doctrine\Common\Collections\Collection
+     * @var Collection
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\EventBundle\Entity\Role",
+     *     mappedBy="type")
      */
     private $roles;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection
+     * @var Collection
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\EventBundle\Entity\Status",
+     *     mappedBy="type")
      */
     private $statuses;
 
@@ -37,8 +77,8 @@ class EventType
      */
     public function __construct()
     {
-        $this->roles = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->statuses = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->roles = new ArrayCollection();
+        $this->statuses = new ArrayCollection();
     }
 
     /**
@@ -55,7 +95,6 @@ class EventType
      * Set label
      *
      * @param array $label
-     *
      * @return EventType
      */
     public function setName($label)
@@ -79,7 +118,6 @@ class EventType
      * Set active
      *
      * @param boolean $active
-     *
      * @return EventType
      */
     public function setActive($active)
@@ -102,11 +140,10 @@ class EventType
     /**
      * Add role
      *
-     * @param \Chill\EventBundle\Entity\Role $role
-     *
+     * @param Role $role
      * @return EventType
      */
-    public function addRole(\Chill\EventBundle\Entity\Role $role)
+    public function addRole(Role $role)
     {
         $this->roles[] = $role;
 
@@ -116,9 +153,9 @@ class EventType
     /**
      * Remove role
      *
-     * @param \Chill\EventBundle\Entity\Role $role
+     * @param Role $role
      */
-    public function removeRole(\Chill\EventBundle\Entity\Role $role)
+    public function removeRole(Role $role)
     {
         $this->roles->removeElement($role);
     }
@@ -126,7 +163,7 @@ class EventType
     /**
      * Get roles
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -136,11 +173,10 @@ class EventType
     /**
      * Add status
      *
-     * @param \Chill\EventBundle\Entity\Status $status
-     *
+     * @param Status $status
      * @return EventType
      */
-    public function addStatus(\Chill\EventBundle\Entity\Status $status)
+    public function addStatus(Status $status)
     {
         $this->statuses[] = $status;
 
@@ -150,9 +186,9 @@ class EventType
     /**
      * Remove status
      *
-     * @param \Chill\EventBundle\Entity\Status $status
+     * @param Status $status
      */
-    public function removeStatus(\Chill\EventBundle\Entity\Status $status)
+    public function removeStatus(Status $status)
     {
         $this->statuses->removeElement($status);
     }
@@ -160,7 +196,7 @@ class EventType
     /**
      * Get statuses
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function getStatuses()
     {
diff --git a/Entity/Participation.php b/Entity/Participation.php
index 07967edca..d578db863 100644
--- a/Entity/Participation.php
+++ b/Entity/Participation.php
@@ -1,43 +1,83 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\EventBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Participation
+ * Class Participation
+ *
+ * @package Chill\EventBundle\Entity
+ * @ORM\Entity(
+ *     repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
+ * @ORM\Table(name="chill_event_participation")
+ * @ORM\HasLifecycleCallbacks()
  */
 class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAccess
 {
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var \DateTime
+     * @ORM\Column(type="datetime")
      */
     private $lastUpdate;
     
     /**
-     * @var \Chill\EventBundle\Entity\Event
+     * @var Event
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\EventBundle\Entity\Event",
+     *     inversedBy="participations")
      */
     private $event;
 
     /**
-     * @var \Chill\PersonBundle\Entity\Person
+     * @var Person
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
     private $person;
 
     /**
-     * @var \Chill\EventBundle\Entity\Role
+     * @var Role
+     * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Role")
      */
     private $role;
 
     /**
-     * @var \Chill\EventBundle\Entity\Status
+     * @var Status
+     * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Status")
      */
     private $status;
 
@@ -56,7 +96,6 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
      * Set lastUpdate
      *
      * @param \DateTime $lastUpdate
-     *
      * @return Participation
      */
     protected function update()
@@ -80,11 +119,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Set event
      *
-     * @param \Chill\EventBundle\Entity\Event $event
-     *
+     * @param Event $event
      * @return Participation
      */
-    public function setEvent(\Chill\EventBundle\Entity\Event $event = null)
+    public function setEvent(Event $event = null)
     {
         if ($this->event !== $event) {
             $this->update();
@@ -98,7 +136,7 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Get event
      *
-     * @return \Chill\EventBundle\Entity\Event
+     * @return Event
      */
     public function getEvent()
     {
@@ -108,11 +146,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Set person
      *
-     * @param \Chill\PersonBundle\Entity\Person $person
-     *
+     * @param Person $person
      * @return Participation
      */
-    public function setPerson(\Chill\PersonBundle\Entity\Person $person = null)
+    public function setPerson(Person $person = null)
     {
         if ($person !== $this->person) {
             $this->update();
@@ -126,7 +163,7 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Get person
      *
-     * @return \Chill\PersonBundle\Entity\Person
+     * @return Person
      */
     public function getPerson()
     {
@@ -136,11 +173,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Set role
      *
-     * @param \Chill\EventBundle\Entity\Role $role
-     *
+     * @param Role $role
      * @return Participation
      */
-    public function setRole(\Chill\EventBundle\Entity\Role $role = null)
+    public function setRole(Role $role = null)
     {
         if ($role !== $this->role) {
             $this->update();
@@ -153,7 +189,7 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Get role
      *
-     * @return \Chill\EventBundle\Entity\Role
+     * @return Role
      */
     public function getRole()
     {
@@ -163,11 +199,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Set status
      *
-     * @param \Chill\EventBundle\Entity\Status $status
-     *
+     * @param Status $status
      * @return Participation
      */
-    public function setStatus(\Chill\EventBundle\Entity\Status $status = null)
+    public function setStatus(Status $status = null)
     {
         if ($this->status !== $status) {
             $this->update();
@@ -181,13 +216,16 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     /**
      * Get status
      *
-     * @return \Chill\EventBundle\Entity\Status
+     * @return Status
      */
     public function getStatus()
     {
         return $this->status;
     }
-
+    
+    /**
+     * @return Center
+     */
     public function getCenter()
     {
         if ($this->getEvent() === NULL) {
@@ -197,7 +235,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
         
         return $this->getEvent()->getCenter();
     }
-
+    
+    /**
+     * @return Scope
+     */
     public function getScope()
     {
         if ($this->getEvent() === NULL) {
@@ -237,14 +278,22 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
                     ->addViolation();
         }
     }
-
+    
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
     public function offsetExists($offset)
     {
         return in_array($offset, array(
             'person', 'role', 'status', 'event'
         ));
     }
-
+    
+    /**
+     * @param mixed $offset
+     * @return Event|Role|Status|Person|mixed
+     */
     public function offsetGet($offset)
     {
         switch ($offset) {
@@ -262,7 +311,12 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
                 break;
         }
     }
-
+    
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     * @return Participation|void
+     */
     public function offsetSet($offset, $value)
     {
         switch($offset) {
@@ -280,7 +334,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
                 break;
         }
     }
-
+    
+    /**
+     * @param mixed $offset
+     */
     public function offsetUnset($offset)
     {
         $this->offsetSet($offset, null);
diff --git a/Entity/Role.php b/Entity/Role.php
index c917dffda..cf7d3a243 100644
--- a/Entity/Role.php
+++ b/Entity/Role.php
@@ -1,29 +1,64 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\EventBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
- * Role
+ * Class Role
+ *
+ * @package Chill\EventBundle\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_event_role")
+ * @ORM\HasLifecycleCallbacks()
  */
 class Role
 {
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var array
+     * @ORM\Column(type="json_array")
      */
     private $name;
 
     /**
      * @var boolean
+     * @ORM\Column(type="boolean")
      */
     private $active;
     
     /**
-     * @var \Chill\EventBundle\Entity\EventType
+     * @var EventType
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\EventBundle\Entity\EventType",
+     *     inversedBy="roles")
      */
     private $type;
 
@@ -42,7 +77,6 @@ class Role
      * Set label
      *
      * @param array $label
-     *
      * @return Role
      */
     public function setName($label)
@@ -66,7 +100,6 @@ class Role
      * Set active
      *
      * @param boolean $active
-     *
      * @return Role
      */
     public function setActive($active)
@@ -90,8 +123,7 @@ class Role
     /**
      * Set type
      *
-     * @param \Chill\EventBundle\Entity\EventType $type
-     *
+     * @param EventType $type
      * @return Role
      */
     public function setType(EventType $type = null)
@@ -104,7 +136,7 @@ class Role
     /**
      * Get type
      *
-     * @return \Chill\EventBundle\Entity\EventType
+     * @return EventType
      */
     public function getType()
     {
diff --git a/Entity/Status.php b/Entity/Status.php
index 6a4ee29ad..a88bff5c4 100644
--- a/Entity/Status.php
+++ b/Entity/Status.php
@@ -1,29 +1,64 @@
 <?php
 
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace Chill\EventBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
- * Status
+ * Class Status
+ *
+ * @package Chill\EventBundle\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_event_status")
+ * @ORM\HasLifecycleCallbacks()
  */
 class Status
 {
     /**
      * @var integer
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-
+    
     /**
      * @var array
+     * @ORM\Column(type="json_array")
      */
     private $name;
-
+    
     /**
      * @var boolean
+     * @ORM\Column(type="boolean")
      */
     private $active;
     
     /**
-     * @var \Chill\EventBundle\Entity\EventType
+     * @var EventType
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\EventBundle\Entity\EventType",
+     *     inversedBy="statuses")
      */
     private $type;
 
@@ -42,7 +77,6 @@ class Status
      * Set label
      *
      * @param array $name
-     *
      * @return Status
      */
     public function setName($name)
@@ -67,7 +101,6 @@ class Status
      * Set active
      *
      * @param boolean $active
-     *
      * @return Status
      */
     public function setActive($active)
@@ -91,11 +124,10 @@ class Status
     /**
      * Set type
      *
-     * @param \Chill\EventBundle\Entity\EventType $type
-     *
+     * @param EventType $type
      * @return Status
      */
-    public function setType(\Chill\EventBundle\Entity\EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
@@ -105,7 +137,7 @@ class Status
     /**
      * Get type
      *
-     * @return \Chill\EventBundle\Entity\EventType
+     * @return EventType
      */
     public function getType()
     {
diff --git a/Resources/config/doctrine/Event.orm.yml b/Resources/config/doctrine/Event.orm.yml
deleted file mode 100644
index bb0237c3f..000000000
--- a/Resources/config/doctrine/Event.orm.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-Chill\EventBundle\Entity\Event:
-    type: entity
-    table: chill_event_event
-    repositoryClass: Chill\EventBundle\Repository\EventRepository
-    id:
-        id:
-            type: integer
-            id: true
-            generator:
-                strategy: AUTO
-    fields:
-        name:
-            type: string
-            length: '150'
-        date:
-            type: datetime
-    oneToMany:
-        participations:
-            targetEntity: Chill\EventBundle\Entity\Participation
-            mappedBy: event
-    manyToOne:
-        center:
-            targetEntity: Chill\MainBundle\Entity\Center
-        type:
-            targetEntity: Chill\EventBundle\Entity\EventType
-        circle:
-            targetEntity: Chill\MainBundle\Entity\Scope
-        moderator:
-            targetEntity: Chill\MainBundle\Entity\User
-
-    lifecycleCallbacks: {  }
diff --git a/Resources/config/doctrine/EventType.orm.yml b/Resources/config/doctrine/EventType.orm.yml
deleted file mode 100644
index dcfab3ba6..000000000
--- a/Resources/config/doctrine/EventType.orm.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-Chill\EventBundle\Entity\EventType:
-    type: entity
-    table: chill_event_event_type
-    id:
-        id:
-            type: integer
-            id: true
-            generator:
-                strategy: AUTO
-    fields:
-        name:
-            type: json_array
-        active:
-            type: boolean
-    oneToMany:
-        roles:
-            targetEntity: Chill\EventBundle\Entity\Role
-            mappedBy: type
-        statuses:
-            targetEntity: Chill\EventBundle\Entity\Status
-            mappedBy: type
-    lifecycleCallbacks: {  }
diff --git a/Resources/config/doctrine/Participation.orm.yml b/Resources/config/doctrine/Participation.orm.yml
deleted file mode 100644
index 377dd54fe..000000000
--- a/Resources/config/doctrine/Participation.orm.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-Chill\EventBundle\Entity\Participation:
-    type: entity
-    table: chill_event_participation
-    repositoryClass: Chill\EventBundle\Repository\ParticipationRepository
-    id:
-        id:
-            type: integer
-            id: true
-            generator:
-                strategy: AUTO
-    fields:
-        lastUpdate:
-            type: datetime
-    manyToOne:
-        event:
-            targetEntity: Chill\EventBundle\Entity\Event
-            inversedBy: participations
-        person:
-            targetEntity: Chill\PersonBundle\Entity\Person
-        role:
-            targetEntity: Chill\EventBundle\Entity\Role
-        status:
-            targetEntity: Chill\EventBundle\Entity\Status
-    lifecycleCallbacks: {  }
diff --git a/Resources/config/doctrine/Role.orm.yml b/Resources/config/doctrine/Role.orm.yml
deleted file mode 100644
index b6a1ae677..000000000
--- a/Resources/config/doctrine/Role.orm.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-Chill\EventBundle\Entity\Role:
-    type: entity
-    table: chill_event_role
-    id:
-        id:
-            type: integer
-            id: true
-            generator:
-                strategy: AUTO
-    fields:
-        name:
-            type: json_array
-        active:
-            type: boolean
-    manyToOne:
-        type:
-            targetEntity: Chill\EventBundle\Entity\EventType
-            inversedBy: roles
-    lifecycleCallbacks: {  }
diff --git a/Resources/config/doctrine/Status.orm.yml b/Resources/config/doctrine/Status.orm.yml
deleted file mode 100644
index f1567f8f0..000000000
--- a/Resources/config/doctrine/Status.orm.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-Chill\EventBundle\Entity\Status:
-    type: entity
-    table: chill_event_status
-    id:
-        id:
-            type: integer
-            id: true
-            generator:
-                strategy: AUTO
-    fields:
-        name:
-            type: json_array
-        active:
-            type: boolean
-    manyToOne:
-        type:
-            targetEntity: Chill\EventBundle\Entity\EventType
-            inversedBy: statuses
-    lifecycleCallbacks: {  }