Refactor
Add drawables provider (and providers in general)
Minor refactor