Re-work cross-platform modularity