rename builder conveneince method newBuilder() to builder(). Cleanup all imports