change app to modular