Refactorization and fix Edifice and Landscape save stuff