diff --git a/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java
index d558edb883..626b418454 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java
@@ -16,12 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MAdvertisement;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Request.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java
index 077b2f635c..a62625dc98 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java
@@ -16,14 +16,33 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import java.util.zip.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.zip.Deflater;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MAsset;
+import org.compiere.model.MAssetDelivery;
+import org.compiere.model.MProductDownload;
+import org.compiere.util.CLogger;
+import org.compiere.util.Msg;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Asset (Delivery) Servlet.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java
index afe0d295a0..91fe7faea9 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java
@@ -16,13 +16,25 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.math.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
  
 /**
  *  Shopping Basket.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java
index 6c61d65332..79cfcff9ea 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java
@@ -16,10 +16,20 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/Click.java b/serverApps/src/main/servlet/org/compiere/wstore/Click.java
index fdc03bbc37..076114df0c 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/Click.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/Click.java
@@ -16,12 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MClick;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *	Click Counter.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/Counter.java b/serverApps/src/main/servlet/org/compiere/wstore/Counter.java
index f196203355..6fe0d21699 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/Counter.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/Counter.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
 
 /**
  *  Web Page Counter
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java
index 48d3789bdc..06bc59eb59 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java
@@ -16,11 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebLogin;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  * 	EMail Servlet
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java
index 7cf3925562..fe759d5bcf 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java
@@ -16,11 +16,21 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Expense Report.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java b/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java
index 2e99311d22..3aea929e25 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java
@@ -16,14 +16,24 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import java.util.Properties;
 
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
-import org.compiere.model.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.br;
+import org.apache.ecs.xhtml.hr;
+import org.compiere.model.MStore;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.HtmlCode;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
 
 /**
  *  Info Links (Menu).
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java
index 447697923d..cc558d0f26 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java
@@ -16,14 +16,26 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MContactInterest;
+import org.compiere.model.MInterestArea;
+import org.compiere.model.MMailMsg;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *	Web Store Subscription Info.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java
index 8386872b70..bd623919f9 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java
@@ -16,14 +16,29 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MInvoice;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java
index fd7ef6d1a4..5a52023325 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java
@@ -16,14 +16,24 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MIssue;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  * 	Issue Reporting
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java b/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java
index 35b37e76bb..3b757020a5 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
+import java.util.Properties;
 
-import org.compiere.util.*;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.Env;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
  
 /**
  *  JSP Environment Utilities
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java
index 0b0e79f8f1..414d35bcb7 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java
@@ -16,12 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MCountry;
+import org.compiere.model.MLocation;
+import org.compiere.model.MRegion;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java b/serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java
index 3213e66aed..6bc84eb7c4 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java
@@ -16,17 +16,28 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
 
-import org.apache.ecs.xhtml.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.apache.ecs.xhtml.br;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.label;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.span;
+import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.compiere.model.MCountry;
+import org.compiere.model.MLocation;
+import org.compiere.model.MRegion;
+import org.compiere.util.CLogger;
+import org.compiere.util.HtmlCode;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
 
 /**
  *  Location City - Postal - Region - Country (Address).
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java b/serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java
index 9e1691048f..1f48eb6746 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java
@@ -16,12 +16,19 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.input;
+import org.compiere.util.CLogger;
+import org.compiere.util.HtmlCode;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
 
 /**
  *  Login Link.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java
index be70fa580b..c417f6c257 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java
@@ -16,13 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Properties;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web User Login.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java b/serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java
index 24775d771e..28a4b94527 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.compiere.util.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Msg;
 
 /**
  *  Message/Translation Tag.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java
index 176c4b9197..38d22bd4e2 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java
@@ -16,12 +16,25 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MAttachment;
+import org.compiere.model.MNote;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Notice.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java
index 56d7bebae5..00fecfa708 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java
@@ -16,12 +16,29 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MDocType;
+import org.compiere.model.MMailMsg;
+import org.compiere.model.MOrder;
+import org.compiere.model.MOrderLine;
+import org.compiere.model.MPayment;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java
index 8a12430ef2..ea6aec7125 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java
@@ -16,14 +16,30 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.math.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MClient;
+import org.compiere.model.MMailMsg;
+import org.compiere.model.MPayment;
+import org.compiere.model.MPaymentValidate;
+import org.compiere.process.DocAction;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *	Web Store Payment Entry & Confirmation
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java b/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java
index dab9dbb66a..95f641bdb3 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.math.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+
+import org.compiere.util.CLogger;
 
 /**
  *  Price List Product
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java b/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java
index aab83c1604..775f82414a 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java
@@ -16,12 +16,17 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.jstl.core.*;
-import javax.servlet.jsp.tagext.*;
-import org.compiere.util.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.jstl.core.Config;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.WebUser;
 
 /**
  * 	PriceList Tag.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java b/serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java
index e4348b2bd1..8414322563 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java
@@ -16,12 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.HtmlCode;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Util;
 
 /**
  *	Product Category List
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java
index b12ab7a242..e6a9b3464c 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java
@@ -16,11 +16,21 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *	Web Product Serach
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java
index 4167d216c6..f25c801113 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java
@@ -16,14 +16,27 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MRegistration;
+import org.compiere.model.MUser;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Registration Servlet.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java b/serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java
index f1190a75e7..e40931ab26 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java
@@ -16,15 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.ecs.xhtml.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Util;
 
 /**
  * 	Request Order Reference Tag
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java
index c085bca42f..1adbd242b8 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java
@@ -16,14 +16,31 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MAttachment;
+import org.compiere.model.MMailMsg;
+import org.compiere.model.MRequest;
+import org.compiere.model.MUser;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.FileUpload;
+import org.compiere.util.Msg;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Request.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java b/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java
index 204ac43437..4709360085 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java
@@ -16,14 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Util;
 
 /**
  *  Request Type Tag.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java
index 2ba1665eb5..7f15068921 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java
@@ -16,16 +16,30 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MRfQ;
+import org.compiere.model.MRfQResponse;
+import org.compiere.model.MRfQResponseLine;
+import org.compiere.model.MRfQResponseLineQty;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web RfQ.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java b/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java
index 08df019c29..678c751024 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java
@@ -16,10 +16,16 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
 
 /**
  *	Single Item Purchase
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java b/serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java
index 27056b61af..a0344858b3 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java
@@ -16,13 +16,23 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.logging.Level;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.xhtml.body;
+import org.apache.ecs.xhtml.p;
+import org.compiere.util.CLogger;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
 
 /**
  * 	Web Store Filter
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java
index 82bb411498..8c5ffa2256 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java
@@ -16,12 +16,22 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
 
-import javax.servlet.http.*;
-import javax.servlet.*;
-import java.io.*;
-import java.util.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web User Update.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java b/serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java
index 35d193e37c..a88ae787a4 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.math.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+
+import org.compiere.util.Env;
 
 /**
  *  Web Basket Line
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java b/serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java
index 7fd427f3e6..452fb22568 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java
@@ -16,13 +16,26 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MAttachment;
+import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebInfo;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUser;
+import org.compiere.util.WebUtil;
+import org.compiere.wf.MWFActivity;
 
 /**
  *  Web Workflow.
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java b/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java
index f4b2d53801..20ec5bc1c5 100644
--- a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java
+++ b/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java
@@ -16,14 +16,23 @@
  *****************************************************************************/
 package org.compiere.wstore;
 
-import java.util.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import org.apache.ecs.xhtml.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.ecs.xhtml.b;
+import org.apache.ecs.xhtml.br;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.compiere.util.CLogger;
+import org.compiere.util.HtmlCode;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+import org.compiere.wf.MWFActivity;
 
 /**
  *	Workfloa Tag.
diff --git a/serverApps/src/main/servlet/org/compiere/www/Test.java b/serverApps/src/main/servlet/org/compiere/www/Test.java
index 401612a510..f8bd92206e 100644
--- a/serverApps/src/main/servlet/org/compiere/www/Test.java
+++ b/serverApps/src/main/servlet/org/compiere/www/Test.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  Test Servlet
diff --git a/serverApps/src/main/servlet/org/compiere/www/Test2.java b/serverApps/src/main/servlet/org/compiere/www/Test2.java
index c8e1579bba..1e40f6709f 100644
--- a/serverApps/src/main/servlet/org/compiere/www/Test2.java
+++ b/serverApps/src/main/servlet/org/compiere/www/Test2.java
@@ -16,10 +16,18 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  Test Servlet 2
diff --git a/serverApps/src/main/servlet/org/compiere/www/WAccount.java b/serverApps/src/main/servlet/org/compiere/www/WAccount.java
index 7d39709008..c946aa942d 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WAccount.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WAccount.java
@@ -16,13 +16,31 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.xhtml.body;
+import org.apache.ecs.xhtml.button;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.th;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridField;
+import org.compiere.model.Lookup;
+import org.compiere.util.CLogger;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *  WAccount Servlet.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WAttachment.java b/serverApps/src/main/servlet/org/compiere/www/WAttachment.java
index a82adf227a..2343591e72 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WAttachment.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WAttachment.java
@@ -16,14 +16,35 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.br;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.label;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.textarea;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.MAttachment;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.util.CLogger;
+import org.compiere.util.FileUpload;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/www/WChat.java b/serverApps/src/main/servlet/org/compiere/www/WChat.java
index 7969b4fd12..e2283c1727 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WChat.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WChat.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
+import java.io.IOException;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.ecs.AlignType;
 import org.apache.ecs.Element;
@@ -32,7 +35,13 @@ import org.apache.ecs.xhtml.tr;
 import org.compiere.model.GridField;
 import org.compiere.model.MChat;
 import org.compiere.model.MChatEntry;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/www/WError.java b/serverApps/src/main/servlet/org/compiere/www/WError.java
index a6d78a391a..b004400e88 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WError.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WError.java
@@ -16,9 +16,14 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 public class WError extends HttpServlet
 {
diff --git a/serverApps/src/main/servlet/org/compiere/www/WFieldUpdate.java b/serverApps/src/main/servlet/org/compiere/www/WFieldUpdate.java
index 3eca697e14..7bee96970b 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WFieldUpdate.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WFieldUpdate.java
@@ -16,12 +16,27 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ecs.xhtml.body;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.script;
+import org.compiere.util.CLogger;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Login;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *  Dynamic Field Updates.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WFilter.java b/serverApps/src/main/servlet/org/compiere/www/WFilter.java
index ef2872e59f..e1a1a55dc6 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WFilter.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WFilter.java
@@ -25,12 +25,21 @@
  **********************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.logging.Level;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
 
 /**
  *  HTML UI Filter to do timing and list parameters
diff --git a/serverApps/src/main/servlet/org/compiere/www/WForm.java b/serverApps/src/main/servlet/org/compiere/www/WForm.java
index 799ded52a9..8fbac03b37 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WForm.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WForm.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  Form
diff --git a/serverApps/src/main/servlet/org/compiere/www/WHelp.java b/serverApps/src/main/servlet/org/compiere/www/WHelp.java
index d3297397db..38fd4115bc 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WHelp.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WHelp.java
@@ -16,10 +16,19 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/www/WLocation.java b/serverApps/src/main/servlet/org/compiere/www/WLocation.java
index 6ad3df3d51..3c552a0140 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WLocation.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WLocation.java
@@ -16,13 +16,38 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.xhtml.b;
+import org.apache.ecs.xhtml.button;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.script;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridField;
+import org.compiere.model.MCountry;
+import org.compiere.model.MLocation;
+import org.compiere.model.MRegion;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  WLocation Servlet.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WLogin.java b/serverApps/src/main/servlet/org/compiere/www/WLogin.java
index 13c3ed2fac..1a3c9c3210 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WLogin.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WLogin.java
@@ -16,15 +16,46 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.security.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.HtmlColor;
+import org.apache.ecs.xhtml.b;
+import org.apache.ecs.xhtml.font;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.img;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.label;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.script;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.strong;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.MSession;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Language;
+import org.compiere.util.Login;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Login Page.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WLookup.java b/serverApps/src/main/servlet/org/compiere/www/WLookup.java
index 9a2eeb266f..79ca43fb9d 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WLookup.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WLookup.java
@@ -16,19 +16,37 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
+import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.logging.Level;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.apache.ecs.xhtml.button;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.th;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridField;
+import org.compiere.model.MProcess;
+import org.compiere.model.MProcessPara;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *  WLookup Servlet.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WMenu.java b/serverApps/src/main/servlet/org/compiere/www/WMenu.java
index d1a9d764ac..ca35d5d2dc 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WMenu.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WMenu.java
@@ -16,16 +16,46 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.io.IOException;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ecs.Element;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.base;
+import org.apache.ecs.xhtml.body;
+import org.apache.ecs.xhtml.cite;
+import org.apache.ecs.xhtml.head;
+import org.apache.ecs.xhtml.link;
+import org.apache.ecs.xhtml.script;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.MForm;
+import org.compiere.model.MTree;
+import org.compiere.model.MTreeNode;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Login;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  * Web Menu
diff --git a/serverApps/src/main/servlet/org/compiere/www/WProcess.java b/serverApps/src/main/servlet/org/compiere/www/WProcess.java
index 5d20cbfb15..b53717ae6a 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WProcess.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WProcess.java
@@ -16,20 +16,62 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.logging.*;
+import java.util.logging.Level;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ecs.AlignType;
+import org.apache.ecs.Element;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.i;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridTab;
+import org.compiere.model.MAllocationHdr;
+import org.compiere.model.MBankStatement;
+import org.compiere.model.MInOut;
+import org.compiere.model.MInventory;
+import org.compiere.model.MInvoice;
+import org.compiere.model.MJournal;
+import org.compiere.model.MJournalBatch;
+import org.compiere.model.MMovement;
+import org.compiere.model.MOrder;
+import org.compiere.model.MPInstance;
+import org.compiere.model.MPInstancePara;
+import org.compiere.model.MPayment;
+import org.compiere.model.MProcess;
+import org.compiere.model.MProcessPara;
+import org.compiere.print.ReportEngine;
+import org.compiere.process.DocumentEngine;
+import org.compiere.process.ProcessInfo;
+import org.compiere.util.ASyncProcess;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Trx;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 import org.compiere.wf.MWFActivity;
 
 
diff --git a/serverApps/src/main/servlet/org/compiere/www/WProcessCtl.java b/serverApps/src/main/servlet/org/compiere/www/WProcessCtl.java
index 03c1163ad6..a244653215 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WProcessCtl.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WProcessCtl.java
@@ -16,23 +16,34 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.lang.reflect.*;
-import java.rmi.*;
-import java.sql.*;
+import java.io.InvalidClassException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Properties;
-import java.util.logging.*;
+import java.util.logging.Level;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.compiere.apps.Waiting;
-import org.compiere.db.*;
-import org.compiere.interfaces.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import org.compiere.db.CConnection;
+import org.compiere.interfaces.Server;
+import org.compiere.model.MPInstance;
+import org.compiere.print.ReportCtl;
+import org.compiere.process.ProcessCall;
+import org.compiere.process.ProcessInfo;
+import org.compiere.process.ProcessInfoUtil;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.Msg;
+import org.compiere.util.Trx;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.wf.MWFProcess;
+import org.compiere.wf.MWorkflow;
 
 /**
  *	Process Interface Controller.
diff --git a/serverApps/src/main/servlet/org/compiere/www/WStart.java b/serverApps/src/main/servlet/org/compiere/www/WStart.java
index cb8542b8fd..974e55405c 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WStart.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WStart.java
@@ -16,10 +16,16 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  Application Start Page
diff --git a/serverApps/src/main/servlet/org/compiere/www/WStatus.java b/serverApps/src/main/servlet/org/compiere/www/WStatus.java
index 235e6f0674..9ec398d406 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WStatus.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WStatus.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *  Status Servlet
diff --git a/serverApps/src/main/servlet/org/compiere/www/WTask.java b/serverApps/src/main/servlet/org/compiere/www/WTask.java
index e86e0426e8..596ac432ab 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WTask.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WTask.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *
diff --git a/serverApps/src/main/servlet/org/compiere/www/WTest.java b/serverApps/src/main/servlet/org/compiere/www/WTest.java
index 4a47861e7e..ba17bf394f 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WTest.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WTest.java
@@ -16,10 +16,19 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *	Web (window) Help
diff --git a/serverApps/src/main/servlet/org/compiere/www/WWindow.java b/serverApps/src/main/servlet/org/compiere/www/WWindow.java
index 46fa60ba1c..28a3899d2a 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WWindow.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WWindow.java
@@ -16,19 +16,52 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Enumeration;
+import java.util.logging.Level;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.apache.ecs.AlignType;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.button;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.hr;
+import org.apache.ecs.xhtml.img;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.script;
+import org.apache.ecs.xhtml.small;
+import org.apache.ecs.xhtml.span;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.th;
+import org.apache.ecs.xhtml.thead;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.model.GridWindowVO;
+import org.compiere.model.MQuery;
+import org.compiere.model.MRole;
+import org.compiere.model.MSession;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 /**
  *  Web Window Servlet
diff --git a/serverApps/src/main/servlet/org/compiere/www/WWindowStatus.java b/serverApps/src/main/servlet/org/compiere/www/WWindowStatus.java
index b1519da185..92779fa6ea 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WWindowStatus.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WWindowStatus.java
@@ -16,9 +16,14 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.util.*;
-import javax.servlet.http.*;
-import org.compiere.model.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.GridTab;
+import org.compiere.model.GridWindow;
+import org.compiere.model.GridWindowVO;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/www/WWorkflow.java b/serverApps/src/main/servlet/org/compiere/www/WWorkflow.java
index 6021ca4583..03daeafeba 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WWorkflow.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WWorkflow.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *
diff --git a/serverApps/src/main/servlet/org/compiere/www/WZoom.java b/serverApps/src/main/servlet/org/compiere/www/WZoom.java
index e6db8a3775..efdf38f65b 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WZoom.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WZoom.java
@@ -16,18 +16,30 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.io.*;
+import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.Properties;
 import java.util.logging.Level;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.GridWindowVO;
+import org.compiere.model.MQuery;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 
 /**
diff --git a/serverApps/src/main/servlet/org/compiere/www/WebField.java b/serverApps/src/main/servlet/org/compiere/www/WebField.java
index 4cea4e982a..e6fe7bbaf0 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WebField.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WebField.java
@@ -16,10 +16,32 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.apache.ecs.AlignType;
+import org.apache.ecs.Element;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.div;
+import org.apache.ecs.xhtml.img;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.label;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.textarea;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.model.Lookup;
+import org.compiere.model.MLocator;
+import org.compiere.model.MRole;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.NamePair;
+import org.compiere.util.Util;
+import org.compiere.util.ValueNamePair;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
 
 /**
  *	Web Field.