Restructure and refectory to support integration  ADempiere core