refactor(app): increase modularity