Factored SemanticType, added Luminaire, factored Texture
project file update
Clean up