Refactor the DrawableBuilder module.