diff --git a/posterita/posterita/src/main/org/posterita/model/MBPartnerProduct.java b/base/src/org/compiere/model/MBPartnerProduct.java
similarity index 97%
rename from posterita/posterita/src/main/org/posterita/model/MBPartnerProduct.java
rename to base/src/org/compiere/model/MBPartnerProduct.java
index 71c4dbb3cf..426b994524 100644
--- a/posterita/posterita/src/main/org/posterita/model/MBPartnerProduct.java
+++ b/base/src/org/compiere/model/MBPartnerProduct.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.posterita.model;
+package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
diff --git a/posterita/posterita/src/main/org/posterita/model/MBlackListCheque.java b/base/src/org/compiere/model/MBlackListCheque.java
similarity index 97%
rename from posterita/posterita/src/main/org/posterita/model/MBlackListCheque.java
rename to base/src/org/compiere/model/MBlackListCheque.java
index 027ac58fa4..012fd1d2ce 100644
--- a/posterita/posterita/src/main/org/posterita/model/MBlackListCheque.java
+++ b/base/src/org/compiere/model/MBlackListCheque.java
@@ -19,7 +19,7 @@
  * Created on 07-Jul-2005 by alok
  *
  */
-package org.posterita.model;
+package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
diff --git a/posterita/posterita/src/main/org/posterita/model/MWebMenu.java b/base/src/org/compiere/model/MWebMenu.java
similarity index 97%
rename from posterita/posterita/src/main/org/posterita/model/MWebMenu.java
rename to base/src/org/compiere/model/MWebMenu.java
index 3afe2cf1fb..3baf132c1a 100644
--- a/posterita/posterita/src/main/org/posterita/model/MWebMenu.java
+++ b/base/src/org/compiere/model/MWebMenu.java
@@ -17,7 +17,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.posterita.model;
+package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
diff --git a/posterita/posterita/src/main/org/posterita/model/MWebProperties.java b/base/src/org/compiere/model/MWebProperties.java
similarity index 97%
rename from posterita/posterita/src/main/org/posterita/model/MWebProperties.java
rename to base/src/org/compiere/model/MWebProperties.java
index 30d0db4200..46f093d29e 100644
--- a/posterita/posterita/src/main/org/posterita/model/MWebProperties.java
+++ b/base/src/org/compiere/model/MWebProperties.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.posterita.model;
+package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/MenuManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/MenuManager.java
index a0c2d68e31..17ac1a5348 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/MenuManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/MenuManager.java
@@ -49,7 +49,7 @@ import org.posterita.exceptions.SystemException;
 import org.posterita.factory.AbstractFactory;
 import org.posterita.factory.POSMenuFactory;
 import org.posterita.keyname.MenuKeyNamePair;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.util.PoManager;
 
 
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java
index 22583a0956..f167fe0c93 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java
@@ -59,7 +59,6 @@ import org.posterita.businesslogic.administration.RoleManager;
 import org.posterita.businesslogic.administration.TaxManager;
 import org.posterita.businesslogic.administration.UserManager;
 import org.posterita.businesslogic.administration.WarehouseManager;
-import org.posterita.businesslogic.core.ApplicationManager;
 import org.posterita.core.FileManager;
 import org.posterita.core.bean.ClientBean;
 import org.posterita.exceptions.ClientAlreadyExistException;
@@ -70,7 +69,7 @@ import org.posterita.factory.POSMenuFactory;
 import org.posterita.factory.SystemObjectsFactory;
 import org.posterita.lib.UdiConstants;
 import org.compiere.model.MBank;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.util.PoManager;
 
 public class POSClientManager extends ClientManager
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/RoleMenuManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/RoleMenuManager.java
index 88cfa380ba..3b572510fb 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/RoleMenuManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/RoleMenuManager.java
@@ -25,7 +25,7 @@ import java.util.Properties;
 
 import org.compiere.model.MRoleMenu;
 import org.posterita.exceptions.OperationException;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.util.PoManager;
 
 
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/administration/BlackListedManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/administration/BlackListedManager.java
index 8cbce89614..52946bb437 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/administration/BlackListedManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/administration/BlackListedManager.java
@@ -40,7 +40,7 @@ import org.posterita.exceptions.BankAlreadyExistException;
 import org.posterita.exceptions.OperationException;
 import org.posterita.exceptions.ProductNotFoundException;
 import org.posterita.lib.UdiConstants;
-import org.posterita.model.MBlackListCheque;
+import org.compiere.model.MBlackListCheque;
 import org.posterita.util.PoManager;
 
 
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/administration/RoleManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/administration/RoleManager.java
index 7c1300446b..4c06fc3574 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/administration/RoleManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/administration/RoleManager.java
@@ -32,7 +32,6 @@ import org.compiere.model.MOrg;
 import org.compiere.model.MRole;
 import org.compiere.model.MRoleMenu;
 import org.compiere.model.MRoleOrgAccess;
-import org.compiere.model.MUserRoles;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -49,7 +48,7 @@ import org.posterita.exceptions.OperationException;
 import org.posterita.exceptions.RoleAlreadyExistsException;
 import org.posterita.exceptions.SystemException;
 import org.posterita.lib.UdiConstants;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.util.PoManager;
 
 
diff --git a/posterita/posterita/src/main/org/posterita/core/MenuItem.java b/posterita/posterita/src/main/org/posterita/core/MenuItem.java
index 663d7fcf04..b230f17f30 100644
--- a/posterita/posterita/src/main/org/posterita/core/MenuItem.java
+++ b/posterita/posterita/src/main/org/posterita/core/MenuItem.java
@@ -27,7 +27,7 @@ import java.util.Properties;
 
 import org.compiere.model.X_U_WebMenu;
 import org.posterita.factory.AbstractFactory;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 
 public class MenuItem
 {
diff --git a/posterita/posterita/src/main/org/posterita/core/SystemObjects.java b/posterita/posterita/src/main/org/posterita/core/SystemObjects.java
index 6bb2b936ea..3bc7afba1f 100644
--- a/posterita/posterita/src/main/org/posterita/core/SystemObjects.java
+++ b/posterita/posterita/src/main/org/posterita/core/SystemObjects.java
@@ -38,7 +38,7 @@ import org.compiere.model.MTaxCategory;
 import org.compiere.model.MUser;
 import org.compiere.util.Env;
 import org.posterita.exceptions.OperationException;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 
 
 public class SystemObjects
diff --git a/posterita/posterita/src/main/org/posterita/factory/DBPropertiesManager.java b/posterita/posterita/src/main/org/posterita/factory/DBPropertiesManager.java
index b42c1c0f9e..63b87340dd 100644
--- a/posterita/posterita/src/main/org/posterita/factory/DBPropertiesManager.java
+++ b/posterita/posterita/src/main/org/posterita/factory/DBPropertiesManager.java
@@ -28,7 +28,7 @@ import java.util.Properties;
 import org.compiere.util.Env;
 
 import org.posterita.exceptions.OperationException;
-import org.posterita.model.MWebProperties;
+import org.compiere.model.MWebProperties;
 
 
 public class DBPropertiesManager implements WebProperties
diff --git a/posterita/posterita/src/main/org/posterita/process/SetupWebPOS.java b/posterita/posterita/src/main/org/posterita/process/SetupWebPOS.java
index 4c2c94f0a1..ccff41bfa1 100644
--- a/posterita/posterita/src/main/org/posterita/process/SetupWebPOS.java
+++ b/posterita/posterita/src/main/org/posterita/process/SetupWebPOS.java
@@ -29,7 +29,7 @@ import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.Env;
 import org.posterita.factory.POSMenuFactory;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.util.PoManager;
 
 
diff --git a/posterita/posterita/src/main/org/posterita/struts/login/LoginAction.java b/posterita/posterita/src/main/org/posterita/struts/login/LoginAction.java
index d5d67ea0c7..05d666c976 100644
--- a/posterita/posterita/src/main/org/posterita/struts/login/LoginAction.java
+++ b/posterita/posterita/src/main/org/posterita/struts/login/LoginAction.java
@@ -60,7 +60,7 @@ import org.posterita.exceptions.UserInactiveException;
 import org.posterita.exceptions.UserNotFoundException;
 import org.posterita.exceptions.WrongPasswordException;
 import org.posterita.lib.UdiConstants;
-import org.posterita.model.MWebMenu;
+import org.compiere.model.MWebMenu;
 import org.posterita.struts.core.BaseDispatchAction;
 import org.posterita.struts.core.DefaultForm;
 import org.posterita.user.WebUserInfo;
diff --git a/posterita/posterita/src/main/org/posterita/struts/login/POSLoginAction.java b/posterita/posterita/src/main/org/posterita/struts/login/POSLoginAction.java
index 3872f4a870..121fb7b7eb 100644
--- a/posterita/posterita/src/main/org/posterita/struts/login/POSLoginAction.java
+++ b/posterita/posterita/src/main/org/posterita/struts/login/POSLoginAction.java
@@ -40,7 +40,6 @@ import org.posterita.beans.LoginBean;
 import org.posterita.beans.TerminalBean;
 import org.posterita.businesslogic.LoginManager;
 import org.posterita.businesslogic.MenuManager;
-import org.posterita.businesslogic.POSManager;
 import org.posterita.businesslogic.POSTerminalManager;
 import org.posterita.core.Configuration;
 import org.posterita.core.SessionStorage;
@@ -53,7 +52,6 @@ import org.posterita.exceptions.NotLoggedInException;
 import org.posterita.exceptions.OperationException;
 import org.posterita.exceptions.UserInactiveException;
 import org.posterita.exceptions.UserNotFoundException;
-import org.posterita.model.MWebMenu;
 import org.posterita.struts.core.BaseDispatchAction;
 import org.posterita.struts.core.DefaultForm;
 import org.posterita.user.WebUserInfo;