Add Maven to make Z750 happy.
And refactored