Remove one more namey reference.
Move image_search module.
Major refactor. Factor out text composion work into its own class.