Finished component modularity first-pass.