Moving files, fixing pom