Fix eclipse package dilemna
Complete maven conversion