Persistence & UI separation refactoring
4 files changed