Restructuring based on charlotte/redhen_raiser workflow.
Resolving conflicts.