maven build refactor done