Modularity has emerged as a central concept for evolutionary biology, providing the field with a theory of organismal structure and variation. This theory has reframed long standing questions and serves as a unified conceptual framework for genetics, developmental biology and multivariate evolution. Research programs in systems biology and quantitative genetics are bridging the gap between these fields. While this synthesis is ongoing, some major themes have emerged and empirical evidence for modularity has become abundant. In this review, we look at modularity from an historical perspective, highlighting its meaning at different levels of biological organization and the different methods that can be used to detect it. We then explore the relationship between quantitative genetic approaches to modularity and developmental genetic studies. We conclude by investigating the dynamic relationship between modularity and the adaptive landscape and how this potentially shapes evolution and can help bridge the gap between micro- and macroevolution.