Restructuring, using Maven