Changed the common module to a simple java library