Finished first pass on refactoring plan structures.