Made the app modular