REFACTORING: demo app file reorganization