Module Refactoring - Separate Shell + App