Move file to namespace
Remove unused use statement
Tidy doc blocks