Moved everything into ecommon package