Move files into correct namespace