update pom and update folder structure