Move app specific templates into the app folders, make reordering of text components in the admin functional
Change the templates to use the textcomponent_set instead of the content field