restructure app for modularity.