Modularity for Universal Apps