Changes to support new texture system; and new setBlock methods

Moved textures to expected places.
Those changes should allow a fast update to 1.5.1.