renamed packages to maven standards