Consolidating TPadFire files into a single repo