diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 43242c5..798b382 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,13 +1,10 @@
-
+
-
- uses
-
-
+
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages.properties
similarity index 100%
rename from src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages.properties
rename to src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages.properties
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_es.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages_es.properties
similarity index 100%
rename from src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_es.properties
rename to src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages_es.properties
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_it.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages_it.properties
similarity index 100%
rename from src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_it.properties
rename to src/main/resources/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerRibbonMessages_it.properties
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties
deleted file mode 100644
index cf36fba..0000000
--- a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-fileGroupHeadingText = Tabular Resource
-openButton = Open
-openButtonToolTip = Open Tabular Resource
-closeButton = Close All
-closeButtonToolTip = Close All Tabular Resources
-cloneButton = Clone
-cloneButtonToolTip = Clone Tabular Resource
-shareButton = Share
-shareButtonToolTip = Share Tabular Resource
-deleteButton = Delete
-deleteButtonToolTip = Delete Tabular Resource
-propertiesButton = Properties
-propertiesButtonToolTip = Show Properties
-importGroupHeadingText = Import
-importSDMXButton = SDMX
-importSDMXButtonToolTip = Import table from SDMX source
-importCSVButton = CSV
-importCSVButtonToolTip = Import table from CSV source
-importJSONButton = JSON
-importJSONButtonToolTip = Import table from JSON source
-exportGroupHeadingText = Export
-exportSDMXButton = SDMX
-exportSDMXButtonToolTip = Export SDMX document
-exportCSVButton = CSV
-exportCSVButtonToolTip = Export CSV document
-exportJSONButton = JSON
-exportJSONButtonToolTip = Export JSON document
-taskGroupHeadingText = Tasks
-timelineButton = Timeline
-timelineButtonToolTip = Timeline
-backgroundButton = Background
-backgroundButtonToolTip = Tasks in background
-historyGroupHeadingText = History
-historyButton = History
-historyButtonToolTip = Show history
-undoButton = Undo
-undoButtonToolTip = Discard last operation
-helpGroupHeadingText = Help
-helpButton = Help
-helpButtonToolTip = Help
-languageButton = Language
-languageButtonToolTip = Language
-english = English
-italian = Italian
-spanish = Spanish
-
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties
deleted file mode 100644
index 5644403..0000000
--- a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-fileGroupHeadingText = Tabular Resource
-openButton = Abre
-openButtonToolTip = Abre Tabular Resource
-closeButton = Cerca de todo
-closeButtonToolTip = Cerrar todas las Tabular Resources
-cloneButton = Clon
-cloneButtonToolTip = Clon Tabular Resource
-shareButton = Cuota
-shareButtonToolTip = Cuota la Tabular Resource
-deleteButton = Borrar
-deleteButtonToolTip = Eliminar la Tabular Resource
-propertiesButton = Propiedades
-propertiesButtonToolTip = Muestra las propiedades
-importGroupHeadingText = Importaciòn
-importSDMXButton = SDMX
-importSDMXButtonToolTip = Importar una tabla de una fuente SDMX
-importCSVButton = CSV
-importCSVButtonToolTip = Importar una tabla de una fuente CSV
-importJSONButton = JSON
-importJSONButtonToolTip = Importar una tabla de una fuente JSON
-exportGroupHeadingText = Exportaciòn
-exportSDMXButton = SDMX
-exportSDMXButtonToolTip = Documento de exportaciòn como SDMX
-exportCSVButton = CSV
-exportCSVButtonToolTip = Documento de exportaciòn como CSV
-exportJSONButton = JSON
-exportJSONButtonToolTip = Documento de exportaciòn como JSON
-taskGroupHeadingText = Tareas
-timelineButton = Timeline
-timelineButtonToolTip = Timeline
-backgroundButton = Background
-backgroundButtonToolTip = Tareas en segundo plano
-historyGroupHeadingText = Historia
-historyButton = Historia
-historyButtonToolTip = Mostrar historial
-undoButton = Deshacer
-undoButtonToolTip = Olvidese de la ùltima operaciòn
-helpGroupHeadingText = Ayuda
-helpButton = Ayuda
-helpButtonToolTip = Ayuda
-languageButton = Idioma
-languageButtonToolTip = Idioma
-english = Inglés
-italian = Italiano
-spanish = Español
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties
deleted file mode 100644
index 6dff534..0000000
--- a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-fileGroupHeadingText = Tabular Resource
-openButton = Apri
-openButtonToolTip = Apri Tabular Resource
-closeButton = Chiudi tutto
-closeButtonToolTip = Chiudi tutte le Tabular Resources
-cloneButton = Clona
-cloneButtonToolTip = Clona Tabular Resource
-shareButton = Condividi
-shareButtonToolTip = Condividi Tabular Resource
-deleteButton = Elimina
-deleteButtonToolTip = Elimina la Tabular Resource
-propertiesButton = Propietà
-propertiesButtonToolTip = Mostra Propietà
-importGroupHeadingText = Importa
-importSDMXButton = SDMX
-importSDMXButtonToolTip = Importa una tabella da una sorgente SDMX
-importCSVButton = CSV
-importCSVButtonToolTip = Importa una tabella da una sorgente CSV
-importJSONButton = JSON
-importJSONButtonToolTip = Importa una tabella da una sorgente JSON
-exportGroupHeadingText = Esporta
-exportSDMXButton = SDMX
-exportSDMXButtonToolTip = Esporta come documento SDMX
-exportCSVButton = CSV
-exportCSVButtonToolTip = Esporta come documento CSV
-exportJSONButton = JSON
-exportJSONButtonToolTip = Esporta come documento JSON
-taskGroupHeadingText = Tasks
-timelineButton = Timeline
-timelineButtonToolTip = Timeline
-backgroundButton = Background
-backgroundButtonToolTip = Tasks in background
-historyGroupHeadingText = Cronologia
-historyButton = Cronologia
-historyButtonToolTip = Mostra Cronologia
-undoButton = Indietro
-undoButtonToolTip = Dimentica l''ultima operazione
-helpGroupHeadingText = Aiuto
-helpButton = Aiuto
-helpButtonToolTip = Aiuto
-languageButton = Lingua
-languageButtonToolTip = Lingua
-english = Inglese
-italian = Italiano
-spanish = Spagnolo
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/classes/log4j_properties_sample b/src/main/webapp/WEB-INF/classes/log4j_properties_sample
index 6ccc40a..94fb683 100644
--- a/src/main/webapp/WEB-INF/classes/log4j_properties_sample
+++ b/src/main/webapp/WEB-INF/classes/log4j_properties_sample
@@ -4,7 +4,7 @@ log4j.rootCategory=TRACE, FILE, CONSOLE
log4j.appender.FILE=org.apache.log4j.RollingFileAppender
#Redirect to Tomcat logs folder
#log4j.appender.FILE.File=C:\\logging.log
-log4j.appender.FILE.File=${catalina.home}/webapps/tabular-data-portlet/logs/TabularDataManagerLog4j.log
+log4j.appender.FILE.File=${catalina.home}/webapps/accounting-manager/logs/AccountingManagerLog4j.log
log4j.appender.FILE.MaxFileSize=10MB
log4j.appender.FILE.MaxBackupIndex=10
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
diff --git a/src/main/webapp/WEB-INF/classes/logback_xml_sample b/src/main/webapp/WEB-INF/classes/logback_xml_sample
index 1c45464..05aadca 100644
--- a/src/main/webapp/WEB-INF/classes/logback_xml_sample
+++ b/src/main/webapp/WEB-INF/classes/logback_xml_sample
@@ -14,11 +14,11 @@
- ${CATALINA_HOME}/webapps/tabular-data-portlet/logs/TabularDataManagerLogBack.log
+ ${CATALINA_HOME}/webapps/accounting-manager/logs/AccountingManagerLogBack.log
- TabularData.%d{yyyy-MM-dd}.log
+ AccountingManager.%d{yyyy-MM-dd}.log
30