Completed conversion to Maven configuration