Start re-organizing contexts and new fixtures