Reorganize builder interfaces/classes. New sub package method.