Move everything to main