reorganize into its own hash and array files