Bills restoring NFA powers, creating Water Resources dep’t filed in Senate