Broke up components, added more textures