Refactoring towards a full-app generation