Organize project to use maven