Fix wait action, move acts to folder