fix intercapitalization; rename package to reflect scalastyle naming
fix package names