MEDIUM / Refactor Foundation after diagram moving