Making app more modular