Photosynthesis has to work efficiently in contrasting environments such as in shade and full sun. Rapid changes in light intensity and over-reduction of the photosynthetic electron transport chain cause production of reactive oxygen species, which can potentially damage the photosynthetic apparatus. Thus, to avoid such damage, photosynthetic electron transport is regulated on many levels, including light absorption in antenna, electron transfer reactions in the reaction centers, and consumption of ATP and NADPH in different metabolic pathways. Many regulatory mechanisms involve the movement of protein-pigment complexes within the thylakoid membrane. Furthermore, a certain number of chloroplast proteins exist in different oligomerization states, which temporally associate to the thylakoid membrane and modulate their activity. This review starts by giving a short overview of the lipid composition of the chloroplast membranes, followed by describing supercomplex formation in cyclic electron flow. Protein movements involved in the various mechanisms of non-photochemical quenching, including thermal dissipation, state transitions and the photosystem II damage–repair cycle are detailed. We highlight the importance of changes in the oligomerization state of VIPP and of the plastid terminal oxidase PTOX and discuss the factors that may be responsible for these changes. Photosynthesis-related protein movements and organization states of certain proteins all play a role in acclimation of the photosynthetic organism to the environment.