Move everything into main