Move main to new_entry