Update ant build and update package names that IntelliJ compensated for.