Refactor packages and configuration files, change tags in pom.xml