Separate celestial events into new package