Adding the new branch and removing the old dir structure
mvn structure fixed