diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e36914ee9fb..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,8 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
-    'js': ['static/src/js/event.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6432a50542e..0d8a4478650 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,14 +53,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="8" colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
-                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
@@ -121,6 +120,7 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
+                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f898647db23..b0f5db0e9d2 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -119,37 +119,3 @@ div.oe_fold_column{
  .no_of_seats{
     width:35px;    
  }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-    
-}
-.oe_td_border
-{
-	width: 5em;
-	padding: 2px;
-	border-right: 1px solid black;
-	text-align: center;
-	border-color: #DCDCDC;
-	
-	
-}
-.oe_td_date_border
-{
-	border-right:1px solid black;
-	border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index e235c31aa08..e4d9cd3897c 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -41,6 +41,9 @@ It defines a new kind of service products that offers you the possibility to cho
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/event_page.css'],
+    'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
new file mode 100644
index 00000000000..0f7b2a81e32
--- /dev/null
+++ b/addons/event_sale/static/src/css/event_page.css
@@ -0,0 +1,31 @@
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/event.js b/addons/event_sale/static/src/js/google_map.js
similarity index 100%
rename from addons/event/static/src/js/event.js
rename to addons/event_sale/static/src/js/google_map.js
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
similarity index 100%
rename from addons/event/static/src/xml/event_address.xml
rename to addons/event_sale/static/src/xml/event_address.xml