Moved files into a namespace