Added modularity to app.