Eclipse maven

Adding changes from (original) code base to Eclipse branch.