Reorganized for better CI