Move inputs for better top level diagram