Restructuring the supercell source tree