cleanup pom a bit, rename files