Adding Task entity
Rearranging bundles