Remove namespace, rename cs file