Re-organize for submission