changed some package lines, and pom