-added option to make with prefix optional
-chaange builder class name to not include name of java class