-OBJ += renderer_classes.o renderer_passthru.o renderer_background.o
-OBJ += renderer_widget.o renderer_widget_decorator.o
+OBJ += decorator.o
+OBJ += renderers/passthru.o
+OBJ += renderers/background.o
+OBJ += renderers/menu.o
+# TODO: Move to a lower makefile
+OBJ += renderers/widget.o renderers/widget/widget_decorator.o
+OBJ += renderers/widget/button.o
+OBJ += renderers/widget/image.o
+OBJ += renderers/widget/disptext.o
+OBJ += renderers/widget/textinput.o