Code cleanup and moved textures