Renamed basic-classes to builder.