restructuring app for better modularity.