Split out single files into more managable packages