HDFS-4249: cleanups
HDFS-4249: restructure the model as phases and steps within phases