Mavenized the structure