HDrawable restructuring