refactor(app): more modularity