Since water and lava are (currently planned to be/in the process of being converted into) fluids, a distinct system from blocks, having them be in the blocks folder is a bit misleading. These should be in dedicated models/fluid/ and textures/fluid/ folders.
Can confirm.