rework to incorporate maven build