fix version in pom.xml
Restructure the folder