Split out into separate files
Split out packages into their own file too