Restructure folder for Mavenization