Converted to use Maven