Remove empty file.
Use correct naming wrt namespaces.