Move all into main