Reorganized branches around new develop and feature model.