Re organisation for production environment