Maven Restructuring

Here you go, the restructuring for Maven.