Renamed solution
Fixed namespaces